diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-22 19:49:37 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-07-22 19:49:37 +0000 |
| commit | 6c17fbc184e98be0a8c46c1ed383f838de57f80c (patch) | |
| tree | ba5a657540603e3d25deeba135b5864f4f65efe8 /src/zabbix_server/server.c | |
| parent | a9bb4776d6000ced0fdbcbee731a13d5ebf1922c (diff) | |
| download | zabbix-6c17fbc184e98be0a8c46c1ed383f838de57f80c.tar.gz zabbix-6c17fbc184e98be0a8c46c1ed383f838de57f80c.tar.xz zabbix-6c17fbc184e98be0a8c46c1ed383f838de57f80c.zip | |
- support of database cache for history and trends (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4462 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'src/zabbix_server/server.c')
| -rw-r--r-- | src/zabbix_server/server.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 63d4a976..1bef1ccd 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -675,8 +675,9 @@ int MAIN_ZABBIX_ENTRY(void) DBclose(); /* To make sure that we can connect to the database before forking new processes */ - DBconnect(ZBX_DB_CONNECT_EXIT); - DBclose(); +/* DBconnect(ZBX_DB_CONNECT_EXIT);*/ +/* Do not close database. It is required for database cache */ +/* DBclose();*/ /*#define CALC_TREND*/ @@ -862,18 +863,22 @@ void zbx_on_exit() free_metrics(); zbx_sleep(2); /* wait for all threads closing */ + + DBconnect(ZBX_DB_CONNECT_EXIT); - zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped"); if(CONFIG_DBSYNCER_FORKS!=0) { free_database_cache(); } + DBclose(); zabbix_close_log(); #ifdef HAVE_SQLITE3 php_sem_remove(&sqlite_access); #endif /* HAVE_SQLITE3 */ + zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped"); + exit(SUCCEED); } |