diff --git a/DjangoBlog/blog_signals.py b/DjangoBlog/blog_signals.py index c171821..f92a237 100644 --- a/DjangoBlog/blog_signals.py +++ b/DjangoBlog/blog_signals.py @@ -16,10 +16,14 @@ import django.dispatch from django.dispatch import receiver from django.conf import settings -from DjangoBlog.utils import cache, send_email, expire_view_cache, logger +from DjangoBlog.utils import cache, send_email, expire_view_cache from DjangoBlog.spider_notify import SpiderNotify from django.contrib.sites.models import Site +import logging + +logger = logging.getLogger(__name__) + comment_save_signal = django.dispatch.Signal(providing_args=["comment_id", "username", "serverport"]) article_save_signal = django.dispatch.Signal(providing_args=['id', 'is_update_views']) user_login_logout_signal = django.dispatch.Signal(providing_args=['id', 'type']) diff --git a/DjangoBlog/utils.py b/DjangoBlog/utils.py index 96d792d..f1606df 100644 --- a/DjangoBlog/utils.py +++ b/DjangoBlog/utils.py @@ -25,7 +25,7 @@ import _thread from django.core.mail import EmailMultiAlternatives from django.conf import settings -logger = logging.getLogger('djangoblog') +logger = logging.getLogger(__name__) def get_max_articleid_commentid(): diff --git a/bin/docker_start.sh b/bin/docker_start.sh index e442673..771572f 100644 --- a/bin/docker_start.sh +++ b/bin/docker_start.sh @@ -14,8 +14,8 @@ echo "Starting $NAME as `whoami`" cd $DJANGODIR export DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE export PYTHONPATH=$DJANGODIR:$PYTHONPATH -pip install -Ur requirements.txt -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com && \ - pip install gunicorn -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com +#pip install -Ur requirements.txt -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com && \ +# pip install gunicorn -i http://pypi.douban.com/simple/ --trusted-host pypi.douban.com python manage.py makemigrations python manage.py migrate python manage.py collectstatic --noinput diff --git a/blog/context_processors.py b/blog/context_processors.py index 27c9cc2..606ecd0 100644 --- a/blog/context_processors.py +++ b/blog/context_processors.py @@ -15,7 +15,10 @@ from .models import Category, Article, Tag, BlogSettings from django.conf import settings from comments.models import Comment -from DjangoBlog.utils import logger, cache, get_blog_setting +from DjangoBlog.utils import cache, get_blog_setting +import logging + +logger = logging.getLogger(__name__) def seo_processor(requests): diff --git a/blog/models.py b/blog/models.py index aa70479..a45351f 100644 --- a/blog/models.py +++ b/blog/models.py @@ -2,14 +2,15 @@ from django.db import models from django.urls import reverse from django.conf import settings from uuslug import slugify - +import logging from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ from django.contrib.sites.models import Site -from DjangoBlog.utils import cache_decorator, logger, cache +from DjangoBlog.utils import cache_decorator, cache from django.utils.functional import cached_property from django.utils.timezone import now +logger = logging.getLogger(__name__) class BaseModel(models.Model): slug = models.SlugField(default='no-slug', max_length=160, blank=True) diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py index 3b70846..dd552f0 100644 --- a/blog/templatetags/blog_tags.py +++ b/blog/templatetags/blog_tags.py @@ -25,10 +25,13 @@ from django.shortcuts import get_object_or_404 import hashlib import urllib from comments.models import Comment -from DjangoBlog.utils import cache_decorator, logger +from DjangoBlog.utils import cache_decorator from django.contrib.auth import get_user_model from oauth.models import OAuthUser from django.contrib.sites.models import Site +import logging + +logger = logging.getLogger(__name__) register = template.Library() diff --git a/blog/views.py b/blog/views.py index 96464b8..123446e 100644 --- a/blog/views.py +++ b/blog/views.py @@ -11,10 +11,13 @@ from django.http import HttpResponse from django.http import HttpResponseRedirect from django.views.decorators.csrf import csrf_exempt from django.contrib.auth.decorators import login_required -from DjangoBlog.utils import cache, logger +from DjangoBlog.utils import cache from django.shortcuts import get_object_or_404 from blog.models import Article, Category, Tag from comments.forms import CommentForm +import logging + +logger = logging.getLogger(__name__) class ArticleListView(ListView): diff --git a/comments/models.py b/comments/models.py index 177c3ed..8ad88d8 100644 --- a/comments/models.py +++ b/comments/models.py @@ -1,7 +1,6 @@ from django.db import models from django.conf import settings from blog.models import Article -from DjangoBlog.utils import logger from django.utils.timezone import now diff --git a/oauth/oauthmanager.py b/oauth/oauthmanager.py index 16f2c74..e575dc9 100644 --- a/oauth/oauthmanager.py +++ b/oauth/oauthmanager.py @@ -18,8 +18,11 @@ from oauth.models import OAuthUser, OAuthConfig from django.conf import settings import requests import json +import logging import urllib.parse -from DjangoBlog.utils import logger, parse_dict_to_url +from DjangoBlog.utils import parse_dict_to_url + +logger = logging.getLogger(__name__) class BaseOauthManager(metaclass=ABCMeta): diff --git a/owntracks/views.py b/owntracks/views.py index de1e4a7..74f8285 100644 --- a/owntracks/views.py +++ b/owntracks/views.py @@ -7,13 +7,15 @@ import itertools from itertools import groupby from django.http import HttpResponse from .models import OwnTrackLog -from DjangoBlog.utils import logger +import logging from django.shortcuts import render from django.http import JsonResponse from django.contrib.auth.decorators import login_required from django.views.decorators.csrf import csrf_exempt import requests +logger = logging.getLogger(__name__) + @csrf_exempt def manage_owntrack_log(request): diff --git a/requirements.txt b/requirements.txt index 6f7c56e..93ab42f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,19 @@ appdirs==1.4.3 +asn1crypto==0.24.0 bottle==0.12.13 certifi==2018.4.16 +cffi==1.11.5 chardet==3.0.4 coverage==4.5.1 -Django==2.0.5 +cryptography==2.2.2 +Django==2.0.7 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2 django-debug-toolbar==1.9.1 django-haystack==2.8.1 django-ipware==2.1.0 -django-pagedown==1.0.4 +django-pagedown==1.0.5 django-uuslug==1.1.8 idna==2.6 jieba==0.39 @@ -19,22 +22,23 @@ markdown2==2.3.5 mistune==0.8.3 olefile==0.45.1 packaging==17.1 -Pillow==5.1.0 +Pillow==5.2.0 +pycparser==2.18 Pygments==2.2.0 -PyMySQL==0.8.1 +PyMySQL==0.9.2 pyparsing==2.2.0 python-memcached==1.59 python-slugify==1.2.5 -pytz==2018.4 +pytz==2018.5 raven==6.9.0 rcssmin==1.0.6 -requests==2.18.4 +requests==2.19.1 rjsmin==1.0.12 six==1.11.0 sqlparse==0.2.4 Unidecode==1.0.22 -urllib3==1.22 +urllib3==1.23 webencodings==0.5.1 -WeRoBot==1.4.1 +WeRoBot==1.6.0 Whoosh==2.7.4 xmltodict==0.11.0 diff --git a/servermanager/Api/commonapi.py b/servermanager/Api/commonapi.py index ad049d0..56e2fd6 100644 --- a/servermanager/Api/commonapi.py +++ b/servermanager/Api/commonapi.py @@ -14,7 +14,9 @@ """ import requests import json -from DjangoBlog.utils import logger +import logging + +logger = logging.getLogger(__name__) class TuLing(): diff --git a/travis_test/requirements.txt b/travis_test/requirements.txt index 4fd50ee..7a07522 100644 --- a/travis_test/requirements.txt +++ b/travis_test/requirements.txt @@ -1,16 +1,19 @@ appdirs==1.4.3 +asn1crypto==0.24.0 bottle==0.12.13 certifi==2018.4.16 +cffi==1.11.5 chardet==3.0.4 coverage==4.5.1 -Django==2.0.5 +cryptography==2.2.2 +Django==2.0.7 django-appconf==1.0.2 django-autoslug==1.9.3 django-compressor==2.2 django-debug-toolbar==1.9.1 django-haystack==2.8.1 django-ipware==2.1.0 -django-pagedown==1.0.4 +django-pagedown==1.0.5 django-uuslug==1.1.8 idna==2.6 jieba==0.39 @@ -19,21 +22,22 @@ markdown2==2.3.5 mistune==0.8.3 olefile==0.45.1 packaging==17.1 -Pillow==5.1.0 +Pillow==5.2.0 +pycparser==2.18 Pygments==2.2.0 -PyMySQL==0.8.1 +PyMySQL==0.9.2 pyparsing==2.2.0 python-slugify==1.2.5 -pytz==2018.4 +pytz==2018.5 raven==6.9.0 rcssmin==1.0.6 -requests==2.18.4 +requests==2.19.1 rjsmin==1.0.12 six==1.11.0 sqlparse==0.2.4 Unidecode==1.0.22 -urllib3==1.22 +urllib3==1.23 webencodings==0.5.1 -WeRoBot==1.4.1 +WeRoBot==1.6.0 Whoosh==2.7.4 xmltodict==0.11.0