diff --git a/applications/ems_datahubs/datahubs.conf b/applications/ems_datahubs/datahubs.conf index 25df79c..c7beefe 100644 --- a/applications/ems_datahubs/datahubs.conf +++ b/applications/ems_datahubs/datahubs.conf @@ -8,7 +8,8 @@ log_filesize = 16M # worker_processes = auto # auto = ncpu # worker_processes = auto worker_processed = 0 -worker_threads = auto +# worker_threads = auto +worker_threads = 1 host = 0.0.0.0 port = 44242 diff --git a/applications/ems_datahubs/main.cpp b/applications/ems_datahubs/main.cpp index 028385e..2735608 100644 --- a/applications/ems_datahubs/main.cpp +++ b/applications/ems_datahubs/main.cpp @@ -537,6 +537,14 @@ int main(int argc, char** argv) exit(0); } + // signal + signal_init(on_reload); + const char* signal = get_arg("s"); + if( signal ) + { + signal_handle(signal); + } + // g_conf_ctx conf_ctx_init(&g_conf_ctx); const char* confile = get_arg("c"); @@ -553,13 +561,6 @@ int main(int argc, char** argv) exit(0); } - // signal - signal_init(on_reload); - const char* signal = get_arg("s"); - if (signal) - { - signal_handle(signal); - } #ifdef OS_UNIX // daemon @@ -926,7 +927,7 @@ void worker_fn(void* userdata) if (listenio == NULL) { - hlogw("worker process finished"); + hloge("worker process finished"); return; } diff --git a/applications/ems_datahubs/opmysql.cpp b/applications/ems_datahubs/opmysql.cpp index 0794efe..a0c249f 100644 --- a/applications/ems_datahubs/opmysql.cpp +++ b/applications/ems_datahubs/opmysql.cpp @@ -34,7 +34,8 @@ bool OpDatabase::OpenDatabase(const std::string& server, const std::string& dbus // 数据库连接配置 //std::string server = "tcp://127.0.0.1:3306"; //std::string dbuser = "root"; - std::string password = "Hj57471000"; + //std::string password = "Hj57471000"; + std::string password = "L2ysc1s1kr"; //std::string database = "hjems"; // 创建连接