diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-23 20:59:14 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2005-08-23 20:59:14 +0000 |
| commit | 2c1ff1cb18f273010ae427defc3037740f82abb6 (patch) | |
| tree | 569d01b060767b820efaad9c61f7c306db1f909d /src/zabbix_agent | |
| parent | c783fa36ea07ccb3d26e430526aa0104ee3cb7af (diff) | |
| download | zabbix-2c1ff1cb18f273010ae427defc3037740f82abb6.tar.gz zabbix-2c1ff1cb18f273010ae427defc3037740f82abb6.tar.xz zabbix-2c1ff1cb18f273010ae427defc3037740f82abb6.zip | |
- make Hostname mandatory, take real hostname if not defined.
git-svn-id: svn://svn.zabbix.com/trunk@1991 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_agent')
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 34f6f86d..77c79cef 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -228,12 +228,14 @@ void usage(char *prog) void init_config(void) { + char tmp[MAX_STRING_LEN]; + struct cfg_line cfg[]= { /* PARAMETER ,VAR ,FUNC, TYPE(0i,1s),MANDATORY,MIN,MAX */ {"Server",&CONFIG_HOSTS_ALLOWED,0,TYPE_STRING,PARM_MAND,0,0}, - {"Hostname",&CONFIG_HOSTNAME,0,TYPE_STRING,PARM_MAND,0,0}, + {"Hostname",&CONFIG_HOSTNAME,0,TYPE_STRING,PARM_OPT,0,0}, {"PidFile",&CONFIG_PID_FILE,0,TYPE_STRING,PARM_OPT,0,0}, {"LogFile",&CONFIG_LOG_FILE,0,TYPE_STRING,PARM_OPT,0,0}, /* {"StatFile",&CONFIG_STAT_FILE,0,TYPE_STRING,PARM_OPT,0,0},*/ @@ -261,6 +263,20 @@ void init_config(void) { CONFIG_PID_FILE=strdup("/tmp/zabbix_agentd.pid"); } + + if(CONFIG_HOSTNAME == NULL) + { + if(SUCCEED == process("system[hostname]",tmp)) + { + CONFIG_HOSTNAME=strdup(tmp); + } + else + { + zabbix_log( LOG_LEVEL_CRIT, "Hostname is not defined"); + exit(1); + } + } + /* if(CONFIG_STAT_FILE == NULL) { CONFIG_STAT_FILE=strdup("/tmp/zabbix_agentd.tmp"); @@ -461,6 +477,7 @@ int main(int argc, char **argv) { zabbix_open_log(LOG_TYPE_FILE,CONFIG_LOG_LEVEL,CONFIG_LOG_FILE); } + zabbix_log( LOG_LEVEL_CRIT, "Hostname [%s]", CONFIG_HOSTNAME); if( FAIL == create_pid_file(CONFIG_PID_FILE)) { |