Skip to content

Commit 2aa9cee

Browse files
committedJun 30, 2018
修改日志级别
1 parent 435bfab commit 2aa9cee

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed
 

‎blog/templatetags/blog_tags.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ def timeformat(data):
3939
return data.strftime(settings.TIME_FORMAT)
4040
# print(data.strftime(settings.TIME_FORMAT))
4141
# return "ddd"
42-
except:
42+
except Exception as e:
43+
logger.error(e)
4344
return ""
4445

4546

4647
@register.simple_tag
4748
def datetimeformat(data):
4849
try:
4950
return data.strftime(settings.DATE_TIME_FORMAT)
50-
except:
51+
except Exception as e:
52+
logger.error(e)
5153
return ""
5254

5355

‎blog/views.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,13 @@ def refresh_memcache(request):
267267
from django.http import HttpResponseForbidden
268268
return HttpResponseForbidden()
269269
except Exception as e:
270+
logger.error(e)
270271
return HttpResponse(e)
271272

272273

273274
def page_not_found_view(request, exception, template_name='blog/error_page.html'):
274275
if exception:
275-
logger.warn(exception)
276+
logger.error(exception)
276277
url = request.get_full_path()
277278
return render(request, template_name,
278279
{'message': '哎呀,您访问的地址 ' + url + ' 是一个未知的地方。请点击首页看看别的?', 'statuscode': '404'}, status=404)
@@ -285,6 +286,6 @@ def server_error_view(request, template_name='blog/error_page.html'):
285286

286287
def permission_denied_view(request, exception, template_name='blog/error_page.html'):
287288
if exception:
288-
logger.warn(exception)
289+
logger.error(exception)
289290
return render(request, template_name,
290291
{'message': '哎呀,您没有权限访问此页面,请点击首页看看别的?', 'statuscode': '403'}, status=403)

‎oauth/oauthmanager.py

+19-12
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ def get_access_token_by_code(self, code):
106106
self.access_token = str(obj['access_token'])
107107
self.openid = str(obj['uid'])
108108
return self.get_oauth_userinfo()
109-
except:
109+
except Exception as e:
110+
logger.error(e)
110111
return None
111112

112113
def get_oauth_userinfo(self):
@@ -130,8 +131,9 @@ def get_oauth_userinfo(self):
130131
if 'email' in datas and datas['email']:
131132
user.email = datas['email']
132133
return user
133-
except:
134-
logger.info('weibo oauth error.rsp:' + rsp)
134+
except Exception as e:
135+
logger.error(e)
136+
logger.error('weibo oauth error.rsp:' + rsp)
135137
return None
136138

137139

@@ -176,8 +178,9 @@ def get_access_token_by_code(self, code):
176178
self.openid = str(obj['id_token'])
177179
logger.info(self.ICON_NAME + ' oauth ' + rsp)
178180
return self.access_token
179-
except:
180-
logger.info(self.ICON_NAME + ' oauth error ' + rsp)
181+
except Exception as e:
182+
logger.error(e)
183+
logger.error(self.ICON_NAME + ' oauth error ' + rsp)
181184
return None
182185

183186
def get_oauth_userinfo(self):
@@ -200,8 +203,9 @@ def get_oauth_userinfo(self):
200203
if datas['email']:
201204
user.email = datas['email']
202205
return user
203-
except:
204-
logger.info('google oauth error.rsp:' + rsp)
206+
except Exception as e:
207+
logger.error(e)
208+
logger.error('google oauth error.rsp:' + rsp)
205209
return None
206210

207211

@@ -245,7 +249,8 @@ def get_access_token_by_code(self, code):
245249
r = parse.parse_qs(rsp)
246250
self.access_token = (r['access_token'][0])
247251
return self.access_token
248-
except:
252+
except Exception as e:
253+
logger.error(e)
249254
return None
250255

251256
def get_oauth_userinfo(self):
@@ -268,8 +273,9 @@ def get_oauth_userinfo(self):
268273
user.email = datas['email']
269274

270275
return user
271-
except:
272-
logger.info('github oauth error.rsp:' + rsp)
276+
except Exception as e:
277+
logger.error(e)
278+
logger.error('github oauth error.rsp:' + rsp)
273279
return None
274280

275281

@@ -312,7 +318,8 @@ def get_access_token_by_code(self, code):
312318
token = str(obj['access_token'])
313319
self.access_token = token
314320
return self.access_token
315-
except:
321+
except Exception as e:
322+
logger.error(e)
316323
return None
317324

318325
def get_oauth_userinfo(self):
@@ -335,7 +342,7 @@ def get_oauth_userinfo(self):
335342
user.picture = str(datas['picture']['data']['url'])
336343
return user
337344
except Exception as e:
338-
logger.warn(e)
345+
logger.error(e)
339346
return None
340347

341348

‎owntracks/views.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def manage_owntrack_log(request):
3434
else:
3535
return HttpResponse('data error')
3636
except Exception as e:
37-
logger.warn(e)
37+
logger.error(e)
3838
return HttpResponse('error')
3939

4040

‎servermanager/Api/commonapi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ def getdata(self, content):
3939
if str(jsons["code"]) == '100000':
4040
return jsons["text"]
4141
except Exception as e:
42-
logger.warn(e)
42+
logger.error(e)
4343
return "哎呀,出错啦。"

0 commit comments

Comments
 (0)