Merge pull request #132 from liangliangyy/dev

修改日志级别

blog/templatetags/blog_tags.py

@@ -39,7 +39,8 @@ def timeformat(data):
         return data.strftime(settings.TIME_FORMAT)
         # print(data.strftime(settings.TIME_FORMAT))
         # return "ddd"
-    except:
+    except Exception as e:
+        logger.error(e)
         return ""
 
 
@@ -47,7 +48,8 @@ def timeformat(data):
 def datetimeformat(data):
     try:
         return data.strftime(settings.DATE_TIME_FORMAT)
-    except:
+    except Exception as e:
+        logger.error(e)
         return ""
 
 

blog/views.py

@@ -267,12 +267,13 @@ def refresh_memcache(request):
             from django.http import HttpResponseForbidden
             return HttpResponseForbidden()
     except Exception as e:
+        logger.error(e)
         return HttpResponse(e)
 
 
 def page_not_found_view(request, exception, template_name='blog/error_page.html'):
     if exception:
-        logger.warn(exception)
+        logger.error(exception)
     url = request.get_full_path()
     return render(request, template_name,
                   {'message': '哎呀，您访问的地址 ' + url + ' 是一个未知的地方。请点击首页看看别的？', 'statuscode': '404'}, status=404)
@@ -285,6 +286,6 @@ def server_error_view(request, template_name='blog/error_page.html'):
 
 def permission_denied_view(request, exception, template_name='blog/error_page.html'):
     if exception:
-        logger.warn(exception)
+        logger.error(exception)
     return render(request, template_name,
                   {'message': '哎呀，您没有权限访问此页面，请点击首页看看别的？', 'statuscode': '403'}, status=403)

oauth/oauthmanager.py

@@ -106,7 +106,8 @@ class WBOauthManager(BaseOauthManager):
             self.access_token = str(obj['access_token'])
             self.openid = str(obj['uid'])
             return self.get_oauth_userinfo()
-        except:
+        except Exception as e:
+            logger.error(e)
             return None
 
     def get_oauth_userinfo(self):
@@ -130,8 +131,9 @@ class WBOauthManager(BaseOauthManager):
             if 'email' in datas and datas['email']:
                 user.email = datas['email']
             return user
-        except:
-            logger.info('weibo oauth error.rsp:' + rsp)
+        except Exception as e:
+            logger.error(e)
+            logger.error('weibo oauth error.rsp:' + rsp)
             return None
 
 
@@ -176,8 +178,9 @@ class GoogleOauthManager(BaseOauthManager):
             self.openid = str(obj['id_token'])
             logger.info(self.ICON_NAME + ' oauth ' + rsp)
             return self.access_token
-        except:
-            logger.info(self.ICON_NAME + ' oauth error ' + rsp)
+        except Exception as e:
+            logger.error(e)
+            logger.error(self.ICON_NAME + ' oauth error ' + rsp)
             return None
 
     def get_oauth_userinfo(self):
@@ -200,8 +203,9 @@ class GoogleOauthManager(BaseOauthManager):
             if datas['email']:
                 user.email = datas['email']
             return user
-        except:
-            logger.info('google oauth error.rsp:' + rsp)
+        except Exception as e:
+            logger.error(e)
+            logger.error('google oauth error.rsp:' + rsp)
             return None
 
 
@@ -245,7 +249,8 @@ class GitHubOauthManager(BaseOauthManager):
             r = parse.parse_qs(rsp)
             self.access_token = (r['access_token'][0])
             return self.access_token
-        except:
+        except Exception as e:
+            logger.error(e)
             return None
 
     def get_oauth_userinfo(self):
@@ -268,8 +273,9 @@ class GitHubOauthManager(BaseOauthManager):
                 user.email = datas['email']
 
             return user
-        except:
-            logger.info('github oauth error.rsp:' + rsp)
+        except Exception as e:
+            logger.error(e)
+            logger.error('github oauth error.rsp:' + rsp)
             return None
 
 
@@ -312,7 +318,8 @@ class FaceBookOauthManager(BaseOauthManager):
             token = str(obj['access_token'])
             self.access_token = token
             return self.access_token
-        except:
+        except Exception as e:
+            logger.error(e)
             return None
 
     def get_oauth_userinfo(self):
@@ -335,7 +342,7 @@ class FaceBookOauthManager(BaseOauthManager):
                 user.picture = str(datas['picture']['data']['url'])
             return user
         except Exception as e:
-            logger.warn(e)
+            logger.error(e)
             return None
 
 

owntracks/views.py

@@ -34,7 +34,7 @@ def manage_owntrack_log(request):
         else:
             return HttpResponse('data error')
     except Exception as e:
-        logger.warn(e)
+        logger.error(e)
         return HttpResponse('error')
 
 

servermanager/Api/commonapi.py

@@ -39,5 +39,5 @@ class TuLing():
             if str(jsons["code"]) == '100000':
                 return jsons["text"]
         except Exception as e:
-            logger.warn(e)
+            logger.error(e)
         return "哎呀，出错啦。"