xuwang
/
cross_doctor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复任务创建bug

This commit is contained in:
wangxu 2025-12-22 14:49:02 +08:00
parent 107c79f907
commit b3fb8a4553
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/common_worker.py
View File

@ -226,6 +226,18 @@ def init_with_config():
if config.has_option('cross_delay_db', 'password'): if config.has_option('cross_delay_db', 'password'):
password = config.get('cross_delay_db', 'password') password = config.get('cross_delay_db', 'password')
g_cross_delay_db['password'] = 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 # redis
if config.has_section('redis'): if config.has_section('redis'):
if config.has_option('redis', 'ip'): if config.has_option('redis', 'ip'):
@ -262,16 +274,20 @@ def init_with_config():
g_user_db['host'] = config.get('user_dbinfo', 'host_inner') g_user_db['host'] = config.get('user_dbinfo', 'host_inner')
if config.has_option('cross_delay_db', 'host_inner'): if config.has_option('cross_delay_db', 'host_inner'):
g_cross_delay_db['host'] = config.get('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_dbinfo)
print(g_roadnet_db) print(g_roadnet_db)
print(g_cloud_db) print(g_cloud_db)
print(g_user_db) print(g_user_db)
print(g_cross_delay_db) print(g_cross_delay_db)
print(g_task_db)
g_db_pool.init_pool(g_dbinfo) g_db_pool.init_pool(g_dbinfo)
g_roadnet_pool.init_pool(g_roadnet_db) g_roadnet_pool.init_pool(g_roadnet_db)
g_cloud_pool.init_pool(g_cloud_db) g_cloud_pool.init_pool(g_cloud_db)
g_user_pool.init_pool(g_user_db) g_user_pool.init_pool(g_user_db)
g_cross_delay_pool.init_pool(g_cross_delay_db) g_cross_delay_pool.init_pool(g_cross_delay_db)
g_task_pool.init_pool(g_task_db)
# 本机服务配置 # 本机服务配置
if config.has_section('server'): if config.has_section('server'):

11
app/global_source.py
View File

@ -61,6 +61,14 @@ g_user_db = {
'db': 'user' 'db': 'user'
} }
g_task_db = {
'host': '120.53.125.169',
'port': 3306,
'user': 'root',
'password': 'pmenJIn7EaK40oThn~~~',
'db': 'task'
}
# 服务配置 # 服务配置
g_citycode_set = set() g_citycode_set = set()
g_config = {} g_config = {}
@ -79,6 +87,7 @@ g_roadnet_pool = DatabaseManager(g_roadnet_db)
g_cloud_pool = DatabaseManager(g_cloud_db) g_cloud_pool = DatabaseManager(g_cloud_db)
g_cross_delay_pool = DatabaseManager(g_cross_delay_db) g_cross_delay_pool = DatabaseManager(g_cross_delay_db)
g_user_pool = DatabaseManager(g_user_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_user = UserDbHelper(g_user_pool)
db_cross = CrossDbHelper(g_cross_delay_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_phasetable = PhaseTableDbHelper(g_db_pool)
db_tmnet = TmnetDbHelper(g_roadnet_pool) db_tmnet = TmnetDbHelper(g_roadnet_pool)
db_workstation = WorkstationDbHelper(g_db_pool) db_workstation = WorkstationDbHelper(g_db_pool)