升级依赖,fix #491

develop
liangliang 5 years ago
parent bb9074324c
commit 818b16aa7d

@ -4,7 +4,8 @@ WORKDIR /code/DjangoBlog/
RUN apt-get install default-libmysqlclient-dev -y && \ RUN apt-get install default-libmysqlclient-dev -y && \
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
ADD requirements.txt requirements.txt ADD requirements.txt requirements.txt
RUN pip install -Ur requirements.txt && \ RUN pip install --upgrade pip && \
pip install -Ur requirements.txt && \
pip install gunicorn[gevent] && \ pip install gunicorn[gevent] && \
pip cache purge pip cache purge

@ -34,22 +34,22 @@ class OnlineMiddleware(object):
http_user_agent = request.META.get('HTTP_USER_AGENT', '') http_user_agent = request.META.get('HTTP_USER_AGENT', '')
ip, _ = get_client_ip(request) ip, _ = get_client_ip(request)
user_agent = parse(http_user_agent) user_agent = parse(http_user_agent)
if not response.streaming:
try: try:
cast_time = time.time() - start_time cast_time = time.time() - start_time
if ELASTICSEARCH_ENABLED: if ELASTICSEARCH_ENABLED:
time_taken = round((cast_time) * 1000, 2) time_taken = round((cast_time) * 1000, 2)
url = request.path url = request.path
from django.utils import timezone from django.utils import timezone
ElaspedTimeDocumentManager.create( ElaspedTimeDocumentManager.create(
url=url, url=url,
time_taken=time_taken, time_taken=time_taken,
log_datetime=timezone.now(), log_datetime=timezone.now(),
useragent=user_agent, useragent=user_agent,
ip=ip) ip=ip)
response.content = response.content.replace( response.content = response.content.replace(
b'<!!LOAD_TIMES!!>', str.encode(str(cast_time)[:5])) b'<!!LOAD_TIMES!!>', str.encode(str(cast_time)[:5]))
except Exception as e: except Exception as e:
logger.error("Error OnlineMiddleware: %s" % e) logger.error("Error OnlineMiddleware: %s" % e)
return response return response

@ -5,8 +5,8 @@ django-haystack==3.0
django-ipware==3.0.2 django-ipware==3.0.2
django-mdeditor==0.1.18 django-mdeditor==0.1.18
django-uuslug==1.2.0 django-uuslug==1.2.0
elasticsearch==7.13.2 elasticsearch==7.13.3
elasticsearch-dsl==7.3.0 elasticsearch-dsl==7.4.0
gevent==21.1.2 gevent==21.1.2
jieba==0.42.1 jieba==0.42.1
jsonpickle==2.0.0 jsonpickle==2.0.0

Loading…
Cancel
Save