|
@@ -8,6 +8,7 @@ import traceback
|
|
|
import sys
|
|
|
import json
|
|
|
|
|
|
+import g_config
|
|
|
import common.sys_comm as sys_comm
|
|
|
from common.sys_comm import (
|
|
|
LOGDBG, LOGINFO, LOGWARN, LOGERR, EC,
|
|
@@ -55,85 +56,39 @@ def sys_init():
|
|
|
os.makedirs("./log/")
|
|
|
print("create log dir succeed !")
|
|
|
|
|
|
- LOGDBG(f" ================ system init ...")
|
|
|
- print(f" ================ system init ...")
|
|
|
-
|
|
|
# 读取配置文件
|
|
|
config = configparser.ConfigParser()
|
|
|
with open('./conf.ini', 'r', encoding='utf-8') as f:
|
|
|
config.read_file(f)
|
|
|
if not (config.has_option('conf', 'module_name') and
|
|
|
- config.has_option('conf', 'platform') and
|
|
|
- config.has_option('conf', 'db_host') and
|
|
|
- config.has_option('conf', 'log_lvl') and
|
|
|
- config.has_option('conf', 'max_log_files') and
|
|
|
- config.has_option('conf', 'max_log_files')):
|
|
|
+ config.has_option('conf', 'server_ip')):
|
|
|
LOGDBG("sys_init failed, invalid conf.ini param")
|
|
|
return 0
|
|
|
-
|
|
|
- if not (config.has_option('conf', 'db_host')):
|
|
|
- LOGDBG("sys_init failed, invalid db param")
|
|
|
- return 0
|
|
|
-
|
|
|
- if not (config.has_option('linux', 'host_ip') and
|
|
|
- config.has_option('windows', 'host_ip') and
|
|
|
- config.has_option('windows', 'server_ip') and
|
|
|
- config.has_option('windows', 'ssh_host') and
|
|
|
- config.has_option('windows', 'ssh_port')):
|
|
|
- LOGDBG("sys_init failed, invalid host_ip param")
|
|
|
- return 0
|
|
|
LOGDBG("read conf.ini succeed !")
|
|
|
|
|
|
-
|
|
|
- # 初始化日志配置
|
|
|
- with sys_comm.g_log_conf_mtx:
|
|
|
- sys_comm.g_log_conf["module_name"] = str(config["conf"]["module_name"])
|
|
|
- sys_comm.g_log_conf["log_lvl"] = int(config["conf"]["log_lvl"])
|
|
|
- sys_comm.g_log_conf["max_log_size"] = int(config["conf"]["max_log_size"]) * 1024 * 1024
|
|
|
- sys_comm.g_log_conf["max_log_files"] = int(config["conf"]["max_log_files"])
|
|
|
- LOGDBG("log init succeed")
|
|
|
-
|
|
|
- # 初始化系统配置
|
|
|
- with sys_comm.g_sys_conf_mtx:
|
|
|
- sys_comm.g_sys_conf["module_name"] = str(config["conf"]["module_name"])
|
|
|
- sys_comm.g_sys_conf["platform"] = int(config["conf"]["platform"])
|
|
|
- sys_comm.g_sys_conf["db_host"] = str(config["conf"]["db_host"])
|
|
|
- sys_comm.g_sys_conf["log_lvl"] = int(config["conf"]["log_lvl"])
|
|
|
- sys_comm.g_sys_conf["max_log_size"] = int(config["conf"]["max_log_size"]) * 1024 * 1024
|
|
|
- sys_comm.g_sys_conf["max_log_files"] = int(config["conf"]["max_log_files"])
|
|
|
-
|
|
|
- # windows 本地
|
|
|
- if sys_comm.g_sys_conf["platform"] == 0:
|
|
|
- sys_comm.g_sys_conf["host_ip"] = str(config["windows"]["host_ip"])
|
|
|
- sys_comm.g_sys_conf["server_ip"] = str(config["windows"]["server_ip"])
|
|
|
- sys_comm.g_sys_conf["ssh_host"] = str(config["windows"]["ssh_host"])
|
|
|
- sys_comm.g_sys_conf["ssh_port"] = int(config["windows"]["ssh_port"])
|
|
|
- mp.MQTT_BROKER = sys_comm.g_sys_conf["server_ip"]
|
|
|
-
|
|
|
- # linux 服务器
|
|
|
- elif sys_comm.g_sys_conf["platform"] == 1:
|
|
|
- sys_comm.g_sys_conf["host_ip"] = str(config["linux"]["host_ip"])
|
|
|
- mp.MQTT_BROKER = sys_comm.g_sys_conf["host_ip"]
|
|
|
-
|
|
|
- sys_comm.g_sys_conf["sp_id"] = sys_comm.g_sys_conf["module_name"] + "_" + str(get_utc_time_ms())
|
|
|
-
|
|
|
-
|
|
|
- # 报警配置
|
|
|
- sys_comm.g_sys_conf["alarm_conf"] = sys_comm.alarm_conf
|
|
|
+ server_ip = config["conf"]["server_ip"].strip()
|
|
|
+ module_name = config["conf"]["module_name"].strip()
|
|
|
+ sp_id = module_name + "_" + str(get_utc_time_ms())
|
|
|
+ if g_config.init_g_sys_conf(server_ip, module_name, sp_id):
|
|
|
+ print(f" ================ system init failed, invalid server_ip: {server_ip}")
|
|
|
+ LOGERR(f" ================ system init failed, invalid server_ip: {server_ip}")
|
|
|
+ return -1
|
|
|
|
|
|
# 启动成功,打印系统信息
|
|
|
- module_name = sys_comm.g_sys_conf["module_name"]
|
|
|
- platform = sys_comm.g_sys_conf["platform"]
|
|
|
- host_ip = sys_comm.g_sys_conf["host_ip"]
|
|
|
- max_log_files = sys_comm.g_sys_conf["max_log_files"]
|
|
|
- max_log_size = sys_comm.g_sys_conf["max_log_size"]
|
|
|
- log_lvl = sys_comm.g_sys_conf["log_lvl"]
|
|
|
- sp_id = sys_comm.g_sys_conf["sp_id"]
|
|
|
+ module_name = g_config.g_sys_conf["module_name"]
|
|
|
+ platform = g_config.g_sys_conf["platform"]
|
|
|
+ host_ip = g_config.g_sys_conf["host_ip"]
|
|
|
+ service = g_config.g_sys_conf["service"]["ip"]
|
|
|
+ max_log_files = sys_comm.g_log_conf["max_log_files"]
|
|
|
+ max_log_size = sys_comm.g_log_conf["max_log_size"]
|
|
|
+ log_lvl = sys_comm.g_log_conf["log_lvl"]
|
|
|
+ sp_id = g_config.g_sys_conf["sp_id"]
|
|
|
|
|
|
print(f" ================ system init succeed !")
|
|
|
print(f" ================ module : {module_name}")
|
|
|
print(f" ================ platform : {platform}")
|
|
|
print(f" ================ host_ip : {host_ip}")
|
|
|
+ print(f" ================ service : {service}")
|
|
|
print(f" ================ max_log_files : {max_log_files}")
|
|
|
print(f" ================ max_log_size : {max_log_size}")
|
|
|
print(f" ================ log_lvl : {log_lvl}")
|
|
@@ -144,6 +99,7 @@ def sys_init():
|
|
|
LOGINFO(f" ================ module : {module_name}")
|
|
|
LOGINFO(f" ================ platform : {platform}")
|
|
|
LOGINFO(f" ================ host_ip : {host_ip}")
|
|
|
+ print(f" ================ service : {service}")
|
|
|
LOGINFO(f" ================ max_log_files : {max_log_files}")
|
|
|
LOGINFO(f" ================ max_log_size : {max_log_size}")
|
|
|
LOGINFO(f" ================ log_lvl : {log_lvl}")
|