diff options
| author | Lu <[email protected]> | 2018-07-26 19:43:20 +0800 |
|---|---|---|
| committer | Lu <[email protected]> | 2018-07-26 19:43:20 +0800 |
| commit | 3f3bd23e54538897ada98a255280a7e8ebf8f8a0 (patch) | |
| tree | 278dc20bf5d3b4c468ee1565923c368ccfac03aa | |
| parent | 0e6588a2e8bd705b7e2d749d7d416d9274b23788 (diff) | |
调整rdkafka的初始化位置到fork()后，避免fork()对rdkafka句柄内部资源的影响。
| -rw-r--r-- | src/logger.cc | 4 | ||||
| -rw-r--r-- | src/main.cc | 3 | ||||
| -rw-r--r-- | src/opts.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/logger.cc b/src/logger.cc index dff9e7c..dd5c6df 100644 --- a/src/logger.cc +++ b/src/logger.cc @@ -14,8 +14,8 @@ const char * __topic_id_to_string(int topic_id) { static std::map<int, const char *> __topic_id_to_string_map = { - {LOG_TOPIC_CTRL_IP, "PXY_CTRL_IP"}, - {LOG_TOPIC_CTRL_HTTP, "PXY_CTRL_HTTP"}, + {LOG_TOPIC_CTRL_IP, "PXY-IP-LOG"}, + {LOG_TOPIC_CTRL_HTTP, "PXY-HTTP-LOG"}, }; return __topic_id_to_string_map[topic_id]; diff --git a/src/main.cc b/src/main.cc index bd9fbfd..125ccce 100644 --- a/src/main.cc +++ b/src/main.cc @@ -290,6 +290,7 @@ main(int argc, char *argv[]) opts = tfe_config_new(); g_tfe_config = opts; + TfeConfigParser __config_parser("conf/tfe.conf"); event_enable_debug_logging(0); START_EASYLOGGINGPP(argc, argv); @@ -941,6 +942,8 @@ main(int argc, char *argv[]) } /* child */ + g_tfe_instance->struct_logger_module = StructLogger::Factory(__config_parser); + /* close pidfile in child */ if (opts->pidfile) close(pidfd); diff --git a/src/opts.cc b/src/opts.cc index c8573a1..dd80c9f 100644 --- a/src/opts.cc +++ b/src/opts.cc @@ -379,8 +379,6 @@ void tfe_config_load_from_file(tfe_config * cfg, const char * c_str_file) __maatframe_init(cfg); /* forge socket */ __forge_socket_load_from_file(cfg, __config_parser); - /* Logger */ - g_tfe_instance->struct_logger_module = StructLogger::Factory(__config_parser); } catch (cfg_invalid_format & e) { |