summaryrefslogtreecommitdiffstats
path: root/src/zabbix_agent
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-06-28 06:30:54 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-06-28 06:30:54 +0000
commit3b14ea6fdbb9be8cf0ca72a99bb018f05019bcdb (patch)
tree9a0864ad4cba8a153d13abae8e75f161c4f25c9c /src/zabbix_agent
parent03a70d67f9051ab0dca5f49fa5a2f5c66dc789e7 (diff)
downloadzabbix-3b14ea6fdbb9be8cf0ca72a99bb018f05019bcdb.tar.gz
zabbix-3b14ea6fdbb9be8cf0ca72a99bb018f05019bcdb.tar.xz
zabbix-3b14ea6fdbb9be8cf0ca72a99bb018f05019bcdb.zip
- fixed permissions of log files when starting as 'root' (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2989 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_agent')
-rw-r--r--src/zabbix_agent/zabbix_agentd.c13
1 files changed, 10 insertions, 3 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();