Skip to content

Commit da26b02

Browse files
liangliangyyliangliangyy
committed
删除部分日志，为site增加缓存
1 parent 1c7732e commit da26b02

File tree

17 files changed

+41
-60
lines changed

17 files changed

+41
-60
lines changed

‎DjangoBlog/admin_site.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
@time: 2018/1/7 上午2:21
1414
"""
1515
from django.contrib.admin import AdminSite
16-
from django.contrib.sites.models import Site
16+
from DjangoBlog.utils import get_current_site
1717
from django.contrib.sites.admin import SiteAdmin
1818
from django.contrib.admin.models import LogEntry
19-
19+
from django.contrib.sites.models import Site
2020
from DjangoBlog.logentryadmin import LogEntryAdmin
2121
from blog.admin import *
2222
from accounts.admin import *

‎DjangoBlog/blog_signals.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from django.dispatch import receiver
1818
from django.conf import settings
1919
from django.contrib.admin.models import LogEntry
20-
from django.contrib.sites.models import Site
20+
from DjangoBlog.utils import get_current_site
2121
from django.core.mail import EmailMultiAlternatives
2222
from django.db.models.signals import post_save
2323
from django.contrib.auth.signals import user_logged_in, user_logged_out, user_login_failed
@@ -65,7 +65,7 @@ def send_email_signal_handler(sender, **kwargs):
6565
def oauth_user_login_signal_handler(sender, **kwargs):
6666
id = kwargs['id']
6767
oauthuser = OAuthUser.objects.get(id=id)
68-
site = Site.objects.get_current().domain
68+
site = get_current_site().domain
6969
if oauthuser.picture and not oauthuser.picture.find(site) >= 0:
7070
from DjangoBlog.utils import save_user_avatar
7171
oauthuser.picture = save_user_avatar(oauthuser.picture)
@@ -94,7 +94,7 @@ def model_post_save_callback(sender, instance, created, raw, using, update_field
9494
if isinstance(instance, Comment):
9595

9696
path = instance.article.get_absolute_url()
97-
site = Site.objects.get_current().domain
97+
site = get_current_site().domain
9898
if site.find(':') > 0:
9999
site = site[0:site.find(':')]
100100

‎DjangoBlog/feeds.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from DjangoBlog.utils import CommonMarkdown
2121
from django.contrib.auth import get_user_model
2222
from django.contrib.auth.models import User
23-
from django.contrib.sites.models import Site
23+
from DjangoBlog.utils import get_current_site
2424

2525

2626
class DjangoBlogFeed(Feed):
@@ -46,7 +46,7 @@ def item_description(self, item):
4646
return CommonMarkdown.get_markdown(item.body)
4747

4848
def feed_copyright(self):
49-
# print(Site.objects.get_current().name)
49+
# print(get_current_site().name)
5050
return "Copyright© 2018 且听风吟"
5151

5252
def item_link(self, item):

‎DjangoBlog/tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from django.test import Client, RequestFactory, TestCase
1717
from blog.models import Article, Category, Tag
1818
from django.contrib.auth import get_user_model
19-
from django.contrib.sites.models import Site
19+
from DjangoBlog.utils import get_current_site
2020
from django.urls import reverse
2121
import datetime
2222
from DjangoBlog.utils import *

‎DjangoBlog/utils.py‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@
2121
from pygments.lexers import get_lexer_by_name
2222
from pygments.formatters import html
2323
import logging
24-
import _thread
25-
from django.core.mail import EmailMultiAlternatives
26-
from django.conf import settings
2724
import requests
28-
import datetime
2925
import uuid
3026
import os
3127

@@ -63,7 +59,7 @@ def news(*args, **kwargs):
6359
# logger.info('cache_decorator get cache:%s key:%s' % (func.__name__, key))
6460
return value
6561
else:
66-
# logger.info('cache_decorator set cache:%s key:%s' % (func.__name__, key))
62+
logger.info('cache_decorator set cache:%s key:%s' % (func.__name__, key))
6763
value = func(*args, **kwargs)
6864
cache.set(key, value, expiration)
6965
return value
@@ -110,6 +106,12 @@ def block_code(text, lang, inlinestyles=False, linenos=False):
110106
)
111107

112108

109+
@cache_decorator()
110+
def get_current_site():
111+
site = Site.objects.get_current()
112+
return site
113+
114+
113115
class BlogMarkDownRenderer(mistune.Renderer):
114116
def block_code(self, text, lang=None):
115117
# renderer has an options
@@ -124,13 +126,13 @@ def autolink(self, link, is_email=False):
124126
link = 'mailto:%s' % link
125127
if not link:
126128
link = "#"
127-
site = Site.objects.get_current()
129+
site = get_current_site()
128130
nofollow = "" if link.find(site.domain) > 0 else "rel='nofollow'"
129131
return '<a href="%s" %s>%s</a>' % (link, nofollow, text)
130132

131133
def link(self, link, title, text):
132134
link = escape_link(link)
133-
site = Site.objects.get_current()
135+
site = get_current_site()
134136
nofollow = "" if link.find(site.domain) > 0 else "rel='nofollow'"
135137
if not link:
136138
link = "#"
@@ -152,25 +154,6 @@ def get_markdown(value):
152154
def send_email(emailto, title, content):
153155
from DjangoBlog.blog_signals import send_email_signal
154156
send_email_signal.send(send_email.__class__, emailto=emailto, title=title, content=content)
155-
# msg = EmailMultiAlternatives(title, content, from_email=settings.DEFAULT_FROM_EMAIL, to=emailto)
156-
# msg.content_subtype = "html"
157-
#
158-
# def sendmsg_withlog():
159-
# from servermanager.models import EmailSendLog
160-
# log = EmailSendLog()
161-
# log.title = title
162-
# log.content = content
163-
# log.emailto = ','.join(emailto)
164-
#
165-
# try:
166-
# result = msg.send()
167-
# log.send_result = result > 0
168-
# except Exception as e:
169-
# logger.error(e)
170-
# log.send_result = False
171-
# log.save()
172-
#
173-
# _thread.start_new_thread(sendmsg_withlog, ())
174157

175158

176159
def parse_dict_to_url(dict):
@@ -183,7 +166,6 @@ def parse_dict_to_url(dict):
183166
def get_blog_setting():
184167
value = cache.get('get_blog_setting')
185168
if value:
186-
logger.info('get cache get_blog_setting')
187169
return value
188170
else:
189171
from blog.models import BlogSettings

‎accounts/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.db import models
22
from django.contrib.auth.models import AbstractUser, BaseUserManager
33
from django.urls import reverse
4-
from django.contrib.sites.models import Site
4+
from DjangoBlog.utils import get_current_site
55
from django.utils.timezone import now
66

77

@@ -22,6 +22,6 @@ def __str__(self):
2222
return self.email
2323

2424
def get_full_url(self):
25-
site = Site.objects.get_current().domain
25+
site = get_current_site().domain
2626
url = "https://{site}{path}".format(site=site, path=self.get_absolute_url())
2727
return url

‎accounts/tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from django.test import Client, RequestFactory, TestCase
22
from blog.models import Article, Category, Tag
33
from django.contrib.auth import get_user_model
4-
from django.contrib.sites.models import Site
4+
from DjangoBlog.utils import get_current_site
55
import datetime
66
from accounts.models import BlogUser
77
from django.urls import reverse
@@ -16,7 +16,7 @@ def setUp(self):
1616
self.factory = RequestFactory()
1717

1818
def test_validate_account(self):
19-
site = Site.objects.get_current().domain
19+
site = get_current_site().domain
2020
user = BlogUser.objects.create_superuser(email="liangliangyy1@gmail.com",
2121
username="liangliangyy1", password="qwer!@#$ggg")
2222
testuser = BlogUser.objects.get(username='liangliangyy1')

‎blog/admin.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ def get_view_on_site_url(self, obj=None):
8989
url = obj.get_full_url()
9090
return url
9191
else:
92-
from django.contrib.sites.models import Site
93-
site = Site.objects.get_current().domain
92+
from DjangoBlog.utils import get_current_site
93+
site = get_current_site().domain
9494
return site
9595

9696

‎blog/context_processors.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ def seo_processor(requests):
2525
key = 'seo_processor'
2626
value = cache.get(key)
2727
if value:
28-
logger.info('get processor cache.')
2928
return value
3029
else:
3130
logger.info('set processor cache.')

‎blog/management/commands/ping_baidu.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
from django.core.management.base import BaseCommand, CommandError
1717
from blog.models import Article, Tag, Category
1818
from DjangoBlog.spider_notify import SpiderNotify
19-
from django.contrib.sites.models import Site
19+
from DjangoBlog.utils import get_current_site
2020

21-
site = Site.objects.get_current().domain
21+
site = get_current_site().domain
2222

2323

2424
class Command(BaseCommand):

0 commit comments

Comments
 (0)