修改默认端口获取

ibuler · Jan 26, 2016 · 99f0970 · 99f0970
1 parent fe87e32
commit 99f0970
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/jperm/views.py b/jperm/views.py
@@ -16,8 +16,8 @@
 from jumpserver.api import my_render, get_object, CRYPTOR
 
 # 设置PERM APP Log
-from jumpserver.settings import LOG_LEVEL
-logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log')
+from jumpserver.api import logger
+#logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log')
 
 
 @require_role('admin')

diff --git a/jumpserver/api.py b/jumpserver/api.py
@@ -64,7 +64,6 @@ def get_asset_info(asset):
     info = {'hostname': asset.hostname, 'ip': asset.ip}
     if asset.use_default_auth:
         if default:
-            info['port'] = int(default.field2)
             info['username'] = default.field1
             try:
                 info['password'] = CRYPTOR.decrypt(default.field3)
@@ -75,7 +74,10 @@ def get_asset_info(asset):
     else:
         info['username'] = asset.username
         info['password'] = CRYPTOR.decrypt(asset.password)
+    try:
         info['port'] = int(asset.port)
+    except TypeError:
+        info['port'] = int(default.field2)
 
     return info