summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/zabbix_agent/zabbix_agentd.c13
-rw-r--r--src/zabbix_server/server.c14
2 files changed, 22 insertions, 5 deletions
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 430864e6..fbb611cf 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -204,6 +204,12 @@ void daemon_init(void)
}
+ /* Init log files */
+ if(CONFIG_LOG_FILE == NULL)
+ zabbix_open_log(LOG_TYPE_SYSLOG,CONFIG_LOG_LEVEL,NULL);
+ else
+ zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);
+
if( (pid = fork()) != 0 )
{
exit( 0 );
@@ -552,11 +558,12 @@ int main(int argc, char **argv)
/* Must be before init_config() */
init_metrics();
init_config();
-
- if(CONFIG_LOG_FILE == NULL)
+
+/* Moved to daemon_init(), otherwise log files can be created as root */
+/* if(CONFIG_LOG_FILE == NULL)
zabbix_open_log(LOG_TYPE_SYSLOG,CONFIG_LOG_LEVEL,NULL);
else
- zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);
+ zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);*/
load_user_parameters();
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 6ad642ac..e7148329 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -277,6 +277,15 @@ void daemon_init(void)
}
+ if(CONFIG_LOG_FILE == NULL)
+ {
+ zabbix_open_log(LOG_TYPE_SYSLOG,CONFIG_LOG_LEVEL,NULL);
+ }
+ else
+ {
+ zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);
+ }
+
if( (pid = fork()) != 0 )
{
exit( 0 );
@@ -612,14 +621,15 @@ int main(int argc, char **argv)
sigaction(SIGTERM, &phan, NULL);
sigaction(SIGPIPE, &phan, NULL);
- if(CONFIG_LOG_FILE == NULL)
+/* Moved to daemon_init() */
+/* if(CONFIG_LOG_FILE == NULL)
{
zabbix_open_log(LOG_TYPE_SYSLOG,CONFIG_LOG_LEVEL,NULL);
}
else
{
zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE);
- }
+ }*/
if( FAIL == create_pid_file(CONFIG_PID_FILE))
{