diff options
| -rw-r--r-- | man/zabbix_agent2.man | 5 | ||||
| -rw-r--r-- | src/go/cmd/zabbix_agent2/zabbix_agent2.go | 1 | ||||
| -rw-r--r-- | src/zabbix_agent/active.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/listener.c | 2 | ||||
| -rw-r--r-- | src/zabbix_agent/zbxconf.c | 14 | ||||
| -rw-r--r-- | src/zabbix_agent/zbxconf.h | 2 |
6 files changed, 19 insertions, 7 deletions
diff --git a/man/zabbix_agent2.man b/man/zabbix_agent2.man index a27f5bcc3c5..da00693f474 100644 --- a/man/zabbix_agent2.man +++ b/man/zabbix_agent2.man @@ -76,6 +76,11 @@ Perform administrative functions according to \fIruntime\-option\fR. Runtime control options .RS 4 .TP 4 +\fBuserparameter_reload\fR +Reload user parameters from the configuration file +.RE +.RS 4 +.TP 4 \fBloglevel increase\fR Increase log level .RE diff --git a/src/go/cmd/zabbix_agent2/zabbix_agent2.go b/src/go/cmd/zabbix_agent2/zabbix_agent2.go index bde97d7d5cd..b7590fffe58 100644 --- a/src/go/cmd/zabbix_agent2/zabbix_agent2.go +++ b/src/go/cmd/zabbix_agent2/zabbix_agent2.go @@ -100,6 +100,7 @@ func processHelpCommand(c *remotecontrol.Client) (err error) { help := `Remote control interface, available commands: log_level_increase - Increase log level log_level_decrease - Decrease log level + userparameter_reload - Reload user parameters metrics - List available metrics version - Display Agent version help - Display this help message` diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c index e1048bbf2a5..75ada17cab5 100644 --- a/src/zabbix_agent/active.c +++ b/src/zabbix_agent/active.c @@ -1280,7 +1280,7 @@ ZBX_THREAD_ENTRY(active_checks_thread, args) if (1 == need_update_userparam) { zbx_setproctitle("active checks #%d [reloading user parameters]", process_num); - reload_user_parameters(); + reload_user_parameters(process_type, process_num); need_update_userparam = 0; } #endif diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c index 15c53edc219..b91b1bcb5b2 100644 --- a/src/zabbix_agent/listener.c +++ b/src/zabbix_agent/listener.c @@ -147,7 +147,7 @@ ZBX_THREAD_ENTRY(listener_thread, args) if (1 == need_update_userparam) { zbx_setproctitle("listener #%d [reloading user parameters]", process_num); - reload_user_parameters(); + reload_user_parameters(process_type, process_num); need_update_userparam = 0; } #endif diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c index 34b7d4c9743..8173b606f80 100644 --- a/src/zabbix_agent/zbxconf.c +++ b/src/zabbix_agent/zbxconf.c @@ -264,8 +264,11 @@ static int load_config_user_params(void) * * * Purpose: reload user parameters * * * + * Parameters: process_type - process type * + * process_num - process number * + * * ******************************************************************************/ -void reload_user_parameters(void) +void reload_user_parameters(unsigned char process_type, int process_num) { char *error = NULL; @@ -274,18 +277,21 @@ void reload_user_parameters(void) if (FAIL == load_config_user_params()) { - zabbix_log(LOG_LEVEL_ERR, "cannot load user parameters: error processing configuration file"); + zabbix_log(LOG_LEVEL_ERR, "cannot reload user parameters [%s #%d]: error processing configuration file", + get_process_type_string(process_type), process_num); goto out; } if (FAIL == load_user_parameters(CONFIG_USER_PARAMETERS, &error)) { - zabbix_log(LOG_LEVEL_ERR, "cannot reload user parameters, stopped at: %s", error); + zabbix_log(LOG_LEVEL_ERR, "cannot reload user parameters [%s #%d], stopped at: %s", + get_process_type_string(process_type), process_num, error); zbx_free(error); goto out; } - zabbix_log(LOG_LEVEL_INFORMATION, "user parameters reloaded"); + zabbix_log(LOG_LEVEL_INFORMATION, "user parameters reloaded [%s #%d]", get_process_type_string(process_type), + process_num); out: zbx_strarr_free(&CONFIG_USER_PARAMETERS); } diff --git a/src/zabbix_agent/zbxconf.h b/src/zabbix_agent/zbxconf.h index 758ef5e49f4..582f47d5903 100644 --- a/src/zabbix_agent/zbxconf.h +++ b/src/zabbix_agent/zbxconf.h @@ -61,7 +61,7 @@ extern char *CONFIG_TLS_PSK_FILE; void load_aliases(char **lines); int load_user_parameters(char **lines, char **err); int load_key_access_rule(const char *value, const struct cfg_line *cfg); -void reload_user_parameters(void); +void reload_user_parameters(unsigned char process_type, int process_num); #ifdef _WINDOWS void load_perf_counters(const char **def_lines, const char **eng_lines); #endif |