添加日志

lib/apidigikey.py

 #!/usr/bin/env python
 # -*- coding:utf-8 -*-
+import json
 import traceback
 
 import redis
@@ -62,18 +63,25 @@ class DGTokenCrawler(token_lib.BaseTokenCrawler):
                 #     self.logger.error(mgs)
                 #     raise Exception(mgs)
                 # token_json = resp_data['data']
-                mgs = "digikey 刷新token失败,请手动获取"
+                mgs = "digikey返回内容异常：{} 刷新token失败,请手动获取".format(json.dumps(token_json))
                 dd_send_msg(mgs)
                 self.logger.error(mgs)
                 raise Exception(mgs)
-            access_token, refresh_token = token_json['access_token'], token_json['refresh_token']
-            apidigikey_log.info("access_token:" + access_token)
-            apidigikey_log.info("refresh_token" + refresh_token)
-            return access_token, refresh_token
+            else:
+                self.save_token_to_redis(token_json)
         except Exception:
             dd_send_msg('digikey token同步失败：' + traceback.format_exc())
             self.logger.error(traceback.format_exc())
 
+    def save_token_to_redis(self, token_json):
+        access_token, refresh_token = token_json['access_token'], token_json['refresh_token']
+        apidigikey_log.info("access_token:" + access_token)
+        apidigikey_log.info("refresh_token" + refresh_token)
+        self._redis.set(self.token_key, access_token)
+        self._redis2.set(self.token_key, access_token)
+        self._redis.set(self.refresh_token_key, refresh_token)
+        self._redis2.set(self.refresh_token_key, refresh_token)
+
     @retry(tries=5, delay=30)
     def get_token_json(self):
         resp = requests.get(self.refresh_token_url, timeout=30)
@@ -107,15 +115,12 @@ class DGTokenCrawler(token_lib.BaseTokenCrawler):
             # 'refresh_token': 'jwki255qAu14VPDGhuJKQVPHixiAGO1D',
             'grant_type': 'refresh_token'
         }
-        resp = requests.post(p_url, headers=p_headers, data=p_data, timeout=30)
+        resp = requests.post(p_url, headers=p_headers, data=p_data, timeout=60)
+        self.logger.info("digikey token 返回内容：{}".format(resp.text))
         token_json = resp.json()
-
         return token_json
 
     def process(self, is_main):
-        access_token, refresh_token = self.collect_token()
+        self.collect_token()
+
 
-        self._redis.set(self.token_key, access_token)
-        self._redis2.set(self.token_key, access_token)
-        self._redis.set(self.refresh_token_key, refresh_token)
-        self._redis2.set(self.refresh_token_key, refresh_token)