summaryrefslogtreecommitdiffstats
path: root/src/libs/zbxconf
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-08 17:38:20 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-05-08 17:38:20 +0000
commitb62606b1d22dff6f2d0aaf1f31e08d9b70b5c69b (patch)
treeb7752833038c9bbcbbd865aab6902acd4a621681 /src/libs/zbxconf
parent5343c70cb1d0da17424a893aece975071c303797 (diff)
downloadzabbix-b62606b1d22dff6f2d0aaf1f31e08d9b70b5c69b.tar.gz
zabbix-b62606b1d22dff6f2d0aaf1f31e08d9b70b5c69b.tar.xz
zabbix-b62606b1d22dff6f2d0aaf1f31e08d9b70b5c69b.zip
- ZABBIX process will exit on config file open error (Alexei)
- cosmetic changes for server's option '-h' (Alexei) git-svn-id: svn://svn.zabbix.com/trunk@4098 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/libs/zbxconf')
-rw-r--r--src/libs/zbxconf/cfg.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c
index 1780aed4..e8931223 100644
--- a/src/libs/zbxconf/cfg.c
+++ b/src/libs/zbxconf/cfg.c
@@ -71,7 +71,7 @@ int parse_cfg_file(const char *cfg_file,struct cfg_line *cfg)
{
if( NULL == (file = fopen(cfg_file,"r")) )
{
- zbx_error("Cannot open config file [%s] [%s].",cfg_file,strerror(errno));
+ goto lbl_cannot_open;
}
else
{
@@ -158,6 +158,10 @@ int parse_cfg_file(const char *cfg_file,struct cfg_line *cfg)
return SUCCEED;
+lbl_cannot_open:
+ zbx_error("Cannot open config file [%s] [%s].",cfg_file,strerror(errno));
+ exit(1);
+
lbl_missing_mandatory:
zbx_error("Missing mandatory parameter [%s].", cfg[i].parameter);
exit(1);