Merge pull request #6 from yanghongfei/master

[Update]做一些简单的优化

Author: yanghongfei

biz/handlers/admin_user_handler.py

@@ -7,7 +7,6 @@
 
 
 import json
-import tornado.web
 from libs.base_handler import BaseHandler
 from models.server import AdminUser, model_to_dict
 from websdk.db_context import DBContext

biz/handlers/asset_server_handler.py

@@ -3,7 +3,7 @@
 # @Time    : 2019/4/17 16:09
 # @Author  : Fred Yangxiaofei
 # @File    : asset_server_handler.py
-# @Role    : 说明脚本功能
+# @Role    : 主机管理
 
 
 import json
@@ -15,7 +15,6 @@
 from tornado import gen
 from concurrent.futures import ThreadPoolExecutor
 from tornado.concurrent import run_on_executor
-# from libs.server_test import RsyncPublicKey, start_rsync, get_server_sysinfo
 from libs.common import check_ip
 from libs.server.sync_to_tagtree import main as sync_tag_tree
 import datetime
@@ -385,8 +384,6 @@ def sync_task(self):
 
     @gen.coroutine
     def get(self, *args, **kwargs):
-        # msg = yield self.sync_task()
-
         try:
             # 超过120s 返回Timeout
             msg = yield gen.with_timeout(datetime.timedelta(seconds=120), self.sync_task(),

biz/handlers/asset_tag_handler.py

@@ -7,7 +7,6 @@
 
 
 import json
-import tornado.web
 from libs.base_handler import BaseHandler
 from models.server import Tag, Server, ServerTag, model_to_dict
 from models.db import DB, DBTag

biz/handlers/hand_update_asset_handler.py

@@ -26,31 +26,30 @@ class HandUpdateAssetHandler(BaseHandler):
 
     @run_on_executor(executor='_thread_pool')
     def asset_update(self, id_list):
-        # time.sleep(20)  #测试下阻塞
-        server_list = []
         # 检查下状态，是true的话直接推送资产
         with DBContext('r', None, True) as session:
             for i in id_list:
 
-                server_info = session.query(Server.ip, Server.port, AdminUser.system_user,
+                server_list = session.query(Server.ip, Server.port, AdminUser.system_user,
                                             AdminUser.user_key, Server.state).outerjoin(AdminUser,
                                                                                         AdminUser.admin_user == Server.admin_user).filter(
                     Server.id == i).all()
-                server_list.append(server_info)
-                # server_info = [('47.100.231.147', 22, 'root', '-----BEGIN RSA PRIVATE KEYxxxxxEND RSA PRIVATE KEY-----', 'false')]
-                server_state = server_info[0][4]
+                # server_list = [('47.100.231.147', 22, 'root', '-----BEGIN RSA PRIVATE KEYxxxxxEND RSA PRIVATE KEY-----', 'false')]
+                server_state = server_list[0][4]
                 if server_state == 'true':
-                    ins_log.read_log('info', 'update asset info')
+                    ins_log.read_log('info', '机器状态为True，开始更新资产')
                     # 选中的是true，直接更新资产
                     asset_data = get_server_sysinfo(server_list)
+                    ins_log.read_log('info', '资产信息：{}'.format(asset_data))
                     update_asset(asset_data)
 
                 else:
                     # 选中的是其余的状态，那就先推送key, 拿到推送成功的key，更新资产
-                    ins_log.read_log('info', 'rsync public key , update asset info')
+                    ins_log.read_log('info', '状态为非True，先推送公钥再进行更新资产')
                     rsync_sucess_list = rsync_public_key(server_list)
                     if rsync_sucess_list:
                         asset_data = get_server_sysinfo(server_list)
+                        ins_log.read_log('info', '资产信息：{}'.format(asset_data))
                         update_asset(asset_data)
 
     @gen.coroutine
@@ -60,11 +59,10 @@ def post(self, *args, **kwargs):
         if not id_list:
             return self.write(dict(code=1, msg='关键参数不能为空'))
 
-        #yield self.asset_update(id_list)
         try:
-            #超过120s 返回Timeout
+            # 超过120s 返回Timeout
             yield gen.with_timeout(datetime.timedelta(seconds=120), [self.asset_update(id_list)],
-                                                  quiet_exceptions=tornado.gen.TimeoutError)
+                                   quiet_exceptions=tornado.gen.TimeoutError)
         except gen.TimeoutError:
             return self.write(dict(code=-2, msg='TimeOut'))
         return self.write(dict(code=0, msg='任务执行完成，提醒： 完成状态为：True, 错误状态：False， False状态下可点击查看日志进行排错'))

biz/handlers/system_user_handler.py

@@ -7,12 +7,10 @@
 
 
 import json
-import tornado.web
 from libs.base_handler import BaseHandler
 from models.server import SystemUser, model_to_dict
 from websdk.db_context import DBContext
 from opssdk.operate import MyCryptV2
-# from libs.test import MyCrypt
 from libs.common import exec_shell, is_number
 from libs.server.push_system_user import PushSystemUser
 import shortuuid

libs/__pycache__/common.cpython-36.pyc

@@ -3,7 +3,7 @@
 # @Time    : 2019/5/13 14:02
 # @Author  : Fred Yangxiaofei
 # @File    : ecs.py
-# @Role    :  获取Aliyun资产信息推送到CMDB
+# @Role    : 获取Aliyun资产信息推送到CMDB
 
 
 import json
@@ -113,7 +113,7 @@ def get_server_info(self):
             asset_data['os_name'] = i.get('OSName')
             server_list.append(asset_data)
             # print(asset_data)
-            ins_log.read_log('info', asset_data)
+            ins_log.read_log('info', '资产信息:{}'.format(asset_data))
         return server_list
 
     def sync_cmdb(self):

libs/aliyun/ecs.py

@@ -51,7 +51,6 @@ def get_server_info(self):
         if ret:
             for r in ret:
                 for i in r['Instances']:
-                    print(i)
                     asset_data = dict()
                     try:
                         asset_data['hostname'] = i.get('Tags')[0].get('Value')
@@ -81,7 +80,7 @@ def sync_cmdb(self):
             return False
         with DBContext('w') as session:
             for server in server_list:
-                print(server)
+                ins_log.read_log('info', '资产信息:{}'.format(server))
                 ip = server.get('public_ip')
                 instance_id = server.get('instance_id', 'Null')
                 hostname = server.get('hostname', instance_id)

libs/aws/ec2.py

@@ -9,7 +9,6 @@
 import time
 import subprocess
 import paramiko
-import shortuuid
 import concurrent.futures
 import re
 from  libs.ansibleAPI.runner import Runner

libs/common.py

@@ -125,7 +125,7 @@ def get_server_info(self):
             asset_data['os_type'] = os_type
             # print(asset_data)
             server_list.append(asset_data)
-            ins_log.read_log('info', asset_data)
+            ins_log.read_log('info', '资产信息:{}'.format(asset_data))
         return server_list
 
     def sync_cmdb(self):