diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-11 19:37:32 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-04-11 19:37:32 +0000 |
| commit | 2f6f46245ea8d4713d217e6654ebbe5dcb9404c3 (patch) | |
| tree | 75a42f6c2e4e366d5a6729e03c1e868d9e28e2f7 | |
| parent | d718bba52b527b2d5ca3db36bea6231240f9ad0f (diff) | |
| download | zabbix-2f6f46245ea8d4713d217e6654ebbe5dcb9404c3.tar.gz zabbix-2f6f46245ea8d4713d217e6654ebbe5dcb9404c3.tar.xz zabbix-2f6f46245ea8d4713d217e6654ebbe5dcb9404c3.zip | |
- [DEV-137] update of version to 1.5.1. Printing of ZABBIX version when daemon stops. (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@5612 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | src/zabbix_agent/zabbix_agentd.c | 2 | ||||
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 2 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/configure.in b/configure.in index fe218a59..f1f1492b 100644 --- a/configure.in +++ b/configure.in @@ -20,7 +20,7 @@ dnl dnl Process this file with autoconf to produce a configure script. AC_INIT(src/zabbix_server/server.c) -AM_INIT_AUTOMAKE([zabbix],[1.5]) +AM_INIT_AUTOMAKE([zabbix],[1.5.1]) AC_MSG_NOTICE([Configuring $PACKAGE_NAME $PACKAGE_VERSION]) diff --git a/include/common.h b/include/common.h index ac5e4acd..f7a12016 100644 --- a/include/common.h +++ b/include/common.h @@ -121,8 +121,8 @@ #define OFF 0 #define APPLICATION_NAME "ZABBIX Agent" -#define ZABBIX_REVDATE "12 March 2008" -#define ZABBIX_VERSION "1.5" +#define ZABBIX_REVDATE "11 April 2008" +#define ZABBIX_VERSION "1.5.1" #if defined(_WINDOWS) extern char ZABBIX_SERVICE_NAME[64]; diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c index 959685c5..4f463f49 100644 --- a/src/zabbix_agent/zabbix_agentd.c +++ b/src/zabbix_agent/zabbix_agentd.c @@ -329,7 +329,7 @@ void zbx_on_exit() zbx_sleep(2); /* wait for all threads closing */ - zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Agent stopped"); + zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Agent stopped. ZABBIX %s.", ZABBIX_VERSION); zabbix_close_log(); diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index d40658cb..df199b3c 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -607,7 +607,7 @@ void zbx_on_exit() php_sem_remove(&sqlite_access); #endif /* HAVE_SQLITE3 */ - zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped"); + zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped. ZABBIX %s.", ZABBIX_VERSION); exit(SUCCEED); } diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 124064b8..f72c7388 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -842,7 +842,7 @@ void test() zabbix_open_log(LOG_TYPE_FILE,LOG_LEVEL_DEBUG,CONFIG_LOG_FILE); } - zabbix_log( LOG_LEVEL_WARNING, "Starting zabbix_server. ZABBIX %s.", ZABBIX_VERSION); + zabbix_log( LOG_LEVEL_INFORMATION, "Starting zabbix_server. ZABBIX %s.", ZABBIX_VERSION); printf("-= Test Started =-\n\n"); @@ -1270,7 +1270,7 @@ void zbx_on_exit() php_sem_remove(&sqlite_access); #endif /* HAVE_SQLITE3 */ - zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped"); + zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped. ZABBIX %s.", ZABBIX_VERSION); exit(SUCCEED); } |