From 0eab0d4c5a86b172ae2c7d7334ecc083e65b57fa Mon Sep 17 00:00:00 2001
From: New Future <github@newfuture.cc>
Date: Sun, 23 Dec 2018 15:42:58 +0800
Subject: [PATCH] #24 fixed dnspod subdomain

---
 dns/dnspod.py     | 10 ++++++++--
 dns/dnspod_com.py |  3 ++-
 run.py            |  3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dns/dnspod.py b/dns/dnspod.py
index 8f0b919..8e1f2a4 100644
--- a/dns/dnspod.py
+++ b/dns/dnspod.py
@@ -34,8 +34,9 @@ def request(action, param=None, **params):
     if param:
         params.update(param)
 
-    params.update({'login_token': "%s,%s" % (ID, TOKEN), 'format': 'json'})
+    params.update({'login_token': '***', 'format': 'json'})
     logger.debug("%s : params:%s", action, params)
+    params['login_token'] = "%s,%s" % (ID, TOKEN)
 
     if PROXY:
         conn = HTTPSConnection(PROXY)
@@ -78,9 +79,11 @@ def get_domain_info(domain):
                 sub = ".".join(domain_split)
                 break
         else:
+            logger.warn('domain_id: %s, sub: %s', did, sub)
             return None, None
         if not sub:  # root domain根域名https://github.com/NewFuture/DDNS/issues/9
             sub = '@'
+    logger.info('domain_id: %s, sub: %s', did, sub)
     return did, sub
 
 
@@ -96,7 +99,10 @@ def get_domain_id(domain):
         # 如果已经存在直接返回防止再次请求
         return get_domain_id.domain_list[domain]
     else:
-        info = request('Domain.Info', domain=domain)
+        try:
+            info = request('Domain.Info', domain=domain)
+        except Exception:
+            return
         if info and info.get('status', {}).get('code') == "1":
             did = info.get("domain", {}).get("id")
             if did:
diff --git a/dns/dnspod_com.py b/dns/dnspod_com.py
index de78e79..8fe5015 100644
--- a/dns/dnspod_com.py
+++ b/dns/dnspod_com.py
@@ -34,8 +34,9 @@ def request(action, param=None, **params):
     if param:
         params.update(param)
 
-    params.update({'user_token': "%s,%s" % (ID, TOKEN), 'format': 'json'})
+    params.update({'login_token': '***', 'format': 'json'})
     logger.debug("%s : params:%s", action, params)
+    params['login_token'] = "%s,%s" % (ID, TOKEN)
 
     if PROXY:
         conn = HTTPSConnection(PROXY)
diff --git a/run.py b/run.py
index d8c4eeb..74dade1 100755
--- a/run.py
+++ b/run.py
@@ -43,7 +43,6 @@ def get_config(key=None, default=None, path="config.json"):
                     ],
                     "ipv6": [
                         "newfuture.cc",
-                        "ddns.newfuture.cc",
                         "ipv6.ddns.newfuture.cc"
                     ],
                     "index4": "default",
@@ -133,7 +132,7 @@ def main():
         ip.DEBUG = get_config('debug')
         logging.basicConfig(
             level=logging.DEBUG,
-            format='%(asctime)s - %(module)s.%(funcName)s - %(lineno)d@%(pathname)s \n[%(levelname)s] %(message)s')
+            format='%(asctime)s <%(module)s.%(funcName)s> %(lineno)d@%(pathname)s \n[%(levelname)s] %(message)s')
 
     proxy = get_config('proxy') or 'DIRECT'
     proxy_list = proxy.strip('; ') .split(';')