diff options
Diffstat (limited to 'src/zabbix_server/server.c')
| -rw-r--r-- | src/zabbix_server/server.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 5cd62e96067..4aa10ffa80f 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -338,6 +338,8 @@ int CONFIG_SERVICEMAN_SYNC_FREQUENCY = 60; static char *config_file = NULL; static int config_allow_root = 0; +static zbx_config_log_t log_file_cfg = {NULL, NULL, LOG_TYPE_UNDEFINED, 1}; + struct zbx_db_version_info_t db_version_info; int get_process_info_by_thread(int local_server_num, unsigned char *local_process_type, int *local_process_num); @@ -576,8 +578,8 @@ static void zbx_set_defaults(void) CONFIG_MAX_HOUSEKEEPER_DELETE = 0; #endif - if (NULL == CONFIG_LOG_TYPE_STR) - CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE); + if (NULL == log_file_cfg.log_type_str) + log_file_cfg.log_type_str = zbx_strdup(log_file_cfg.log_type_str, ZBX_OPTION_LOGTYPE_FILE); if (NULL == CONFIG_SOCKET_PATH) CONFIG_SOCKET_PATH = zbx_strdup(CONFIG_SOCKET_PATH, "/tmp"); @@ -686,7 +688,7 @@ static void zbx_validate_config(ZBX_TASK_EX *task) /* because they have non-zero default values */ #endif - if (SUCCEED != zbx_validate_log_parameters(task)) + if (SUCCEED != zbx_validate_log_parameters(task, &log_file_cfg)) err = 1; #if !(defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)) @@ -815,11 +817,11 @@ static void zbx_load_config(ZBX_TASK_EX *task) PARM_OPT, 0, 5}, {"PidFile", &CONFIG_PID_FILE, TYPE_STRING, PARM_OPT, 0, 0}, - {"LogType", &CONFIG_LOG_TYPE_STR, TYPE_STRING, + {"LogType", &log_file_cfg.log_type_str, TYPE_STRING, PARM_OPT, 0, 0}, - {"LogFile", &CONFIG_LOG_FILE, TYPE_STRING, + {"LogFile", &log_file_cfg.log_file_name, TYPE_STRING, PARM_OPT, 0, 0}, - {"LogFileSize", &CONFIG_LOG_FILE_SIZE, TYPE_INT, + {"LogFileSize", &log_file_cfg.log_file_size, TYPE_INT, PARM_OPT, 0, 1024}, {"AlertScriptsPath", &CONFIG_ALERT_SCRIPTS_PATH, TYPE_STRING, PARM_OPT, 0, 0}, @@ -967,7 +969,7 @@ static void zbx_load_config(ZBX_TASK_EX *task) parse_cfg_file(config_file, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_STRICT, ZBX_CFG_EXIT_FAILURE); zbx_set_defaults(); - CONFIG_LOG_TYPE = zbx_get_log_type(CONFIG_LOG_TYPE_STR); + log_file_cfg.log_type = zbx_get_log_type(log_file_cfg.log_type_str); zbx_validate_config(task); #if defined(HAVE_MYSQL) || defined(HAVE_POSTGRESQL) @@ -1176,7 +1178,8 @@ int main(int argc, char **argv) exit(SUCCEED == ret ? EXIT_SUCCESS : EXIT_FAILURE); } - return zbx_daemon_start(config_allow_root, CONFIG_USER, t.flags, get_pid_file_path, zbx_on_exit); + return zbx_daemon_start(config_allow_root, CONFIG_USER, t.flags, get_pid_file_path, zbx_on_exit, + log_file_cfg.log_type, log_file_cfg.log_file_name); } static void zbx_check_db(void) @@ -1547,7 +1550,7 @@ static int server_restart_logger(char **error) if (SUCCEED != zbx_locks_create(error)) return FAIL; - if (SUCCEED != zabbix_open_log(CONFIG_LOG_TYPE, CONFIG_LOG_LEVEL, CONFIG_LOG_FILE, error)) + if (SUCCEED != zabbix_open_log(&log_file_cfg, CONFIG_LOG_LEVEL, error)) return FAIL; return SUCCEED; @@ -1667,7 +1670,7 @@ int MAIN_ZABBIX_ENTRY(int flags) exit(EXIT_FAILURE); } - if (SUCCEED != zabbix_open_log(CONFIG_LOG_TYPE, CONFIG_LOG_LEVEL, CONFIG_LOG_FILE, &error)) + if (SUCCEED != zabbix_open_log(&log_file_cfg, CONFIG_LOG_LEVEL, &error)) { zbx_error("cannot open log: %s", error); zbx_free(error); |