diff --git a/app/common_worker.py b/app/common_worker.py index 09b5139..d27d7d7 100644 --- a/app/common_worker.py +++ b/app/common_worker.py @@ -226,6 +226,18 @@ def init_with_config(): if config.has_option('cross_delay_db', 'password'): password = config.get('cross_delay_db', 'password') g_cross_delay_db['password'] = password + if config.has_option('task_db', 'port'): + port = int(config.get('task_db', 'port')) + g_cross_delay_db['port'] = port + if config.has_option('task_db', 'dbname'): + dbname = config.get('task_db', 'dbname') + g_cross_delay_db['db'] = dbname + if config.has_option('task_db', 'user'): + user = config.get('task_db', 'user') + g_cross_delay_db['user'] = user + if config.has_option('task_db', 'password'): + password = config.get('task_db', 'password') + g_cross_delay_db['password'] = password # redis if config.has_section('redis'): if config.has_option('redis', 'ip'): @@ -262,16 +274,20 @@ def init_with_config(): g_user_db['host'] = config.get('user_dbinfo', 'host_inner') if config.has_option('cross_delay_db', 'host_inner'): g_cross_delay_db['host'] = config.get('cross_delay_db', 'host_inner') + if config.has_option('task_db', 'host_inner'): + g_cross_delay_db['host'] = config.get('task_db', 'host_inner') print(g_dbinfo) print(g_roadnet_db) print(g_cloud_db) print(g_user_db) print(g_cross_delay_db) + print(g_task_db) g_db_pool.init_pool(g_dbinfo) g_roadnet_pool.init_pool(g_roadnet_db) g_cloud_pool.init_pool(g_cloud_db) g_user_pool.init_pool(g_user_db) g_cross_delay_pool.init_pool(g_cross_delay_db) + g_task_pool.init_pool(g_task_db) # 本机服务配置 if config.has_section('server'): diff --git a/app/global_source.py b/app/global_source.py index b07544a..ef74415 100644 --- a/app/global_source.py +++ b/app/global_source.py @@ -61,6 +61,14 @@ g_user_db = { 'db': 'user' } +g_task_db = { + 'host': '120.53.125.169', + 'port': 3306, + 'user': 'root', + 'password': 'pmenJIn7EaK40oThn~~~', + 'db': 'task' +} + # 服务配置 g_citycode_set = set() g_config = {} @@ -79,6 +87,7 @@ g_roadnet_pool = DatabaseManager(g_roadnet_db) g_cloud_pool = DatabaseManager(g_cloud_db) g_cross_delay_pool = DatabaseManager(g_cross_delay_db) g_user_pool = DatabaseManager(g_user_db) +g_task_pool = DatabaseManager(g_task_db) # 全局的数据库对象 @@ -88,7 +97,7 @@ g_db_cloud = GWPerfCloudDbHelper(g_cloud_pool) # 全局的数据库对象 db_user = UserDbHelper(g_user_pool) db_cross = CrossDbHelper(g_cross_delay_pool) -db_task = TaskDbHelper(g_db_pool) +db_task = TaskDbHelper(g_task_pool) db_phasetable = PhaseTableDbHelper(g_db_pool) db_tmnet = TmnetDbHelper(g_roadnet_pool) db_workstation = WorkstationDbHelper(g_db_pool)