diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-18 13:36:39 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-08-18 13:36:39 +0000 |
| commit | b22246e08fe4554257dfdd0aa8d378638bceace2 (patch) | |
| tree | be76a196d1cd8b3ff27cb8a3ee4917bcb1ed86b7 | |
| parent | 4687da7a39945d6bbd5b28a0004316f642fe697a (diff) | |
| download | zabbix-b22246e08fe4554257dfdd0aa8d378638bceace2.tar.gz zabbix-b22246e08fe4554257dfdd0aa8d378638bceace2.tar.xz zabbix-b22246e08fe4554257dfdd0aa8d378638bceace2.zip | |
-[DEV-203] Server does not start (Shared memory)
git-svn-id: svn://svn.zabbix.com/trunk@5919 97f52cf1-0a1b-0410-bd0e-c28be96e8082
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | src/zabbix_server/server.c | 8 |
2 files changed, 4 insertions, 5 deletions
@@ -1,5 +1,6 @@ Changes for 1.5.4 + - [DEV-203] fixed probem with permissions of server's shared memory (Sasha) - [DEV-202] fixed compilation problem under Solaris (Sasha) - [DEV-201] improved performance on disabling/enabling, deleting hosts (Artem) - [DEV-200] Queue for proxies (Sasha) diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c index 86a72d3c..c7dbf141 100644 --- a/src/zabbix_server/server.c +++ b/src/zabbix_server/server.c @@ -929,11 +929,6 @@ int main(int argc, char **argv) init_config(); - if(CONFIG_DBSYNCER_FORKS!=0) - { - init_database_cache(ZBX_PROCESS_SERVER); - } - switch (task) { case ZBX_TASK_CHANGE_NODEID: change_nodeid(0,nodeid); @@ -1069,6 +1064,9 @@ int MAIN_ZABBIX_ENTRY(void) exit(FAIL); } + if (CONFIG_DBSYNCER_FORKS != 0) + init_database_cache(ZBX_PROCESS_SERVER); + /*#define CALC_TREND*/ #ifdef CALC_TREND |