← Back to branch summary

~kampka/ubuntu/quantal/zabbix/upstart-support

« back to all changes in this revision

Viewing changes to src/zabbix_server/server.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2009-06-28 19:11:29 UTC
  • mfrom: (19.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090628191129-5esmmf2h3tbff1fv
http://bugs.debian.org/528426
http://bugs.debian.org/534096
http://bugs.debian.org/520197
http://bugs.debian.org/527559
http://bugs.debian.org/527600
http://bugs.debian.org/528571
http://bugs.debian.org/529157
http://bugs.debian.org/529502
http://bugs.debian.org/532344
* New upstream release
* Merge upstream config file to template (Closes: #528426)
* Move logrotate from Depends to Suggests (Closes: #534096)
* Server should not crash anymore if postgresql transaction fails
  (Closes: #520197)
* Update fr.po (Closes: #527559)
* Update es.po (Closes: #527600)
* Update sv.po (Closes: #528571)
* Update it.po (Closes: #529157)
* Update cs.po (Closes: #529502)
* Update de.po (Closes: #532344)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/zabbix_server/server.c
286
286
#endif
287
287
}
288
288
 
289
 
 
290
289
/******************************************************************************
291
290
 *                                                                            *
292
291
 * Function: test                                                             *
856
855
                zabbix_open_log(LOG_TYPE_FILE,LOG_LEVEL_DEBUG,CONFIG_LOG_FILE);
857
856
        }
858
857
 
859
 
        zabbix_log( LOG_LEVEL_INFORMATION, "Starting zabbix_server. ZABBIX %s.", ZABBIX_VERSION);
 
858
        zabbix_log( LOG_LEVEL_INFORMATION, "Starting zabbix_server. ZABBIX %s (revision %s).",
 
859
                        ZABBIX_VERSION,
 
860
                        ZABBIX_REVISION);
860
861
 
861
862
        printf("-= Test Started =-\n\n");
862
863
 
1022
1023
#endif
1023
1024
 
1024
1025
/*      zabbix_log( LOG_LEVEL_WARNING, "INFO [%s]", ZBX_SQL_MOD(a,%d)); */
1025
 
        zabbix_log( LOG_LEVEL_WARNING, "Starting zabbix_server. ZABBIX %s.", ZABBIX_VERSION);
 
1026
        zabbix_log( LOG_LEVEL_WARNING, "Starting zabbix_server. ZABBIX %s (revision %s).",
 
1027
                        ZABBIX_VERSION,
 
1028
                        ZABBIX_REVISION);
1026
1029
 
1027
1030
        zabbix_log( LOG_LEVEL_WARNING, "**** Enabled features ****");
1028
1031
        zabbix_log( LOG_LEVEL_WARNING, "SNMP monitoring:       " SNMP_FEATURE_STATUS    );
1317
1320
        php_sem_remove(&sqlite_access);
1318
1321
#endif /* HAVE_SQLITE3 */
1319
1322
 
1320
 
        zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped. ZABBIX %s.", ZABBIX_VERSION);
 
1323
        zabbix_log(LOG_LEVEL_INFORMATION, "ZABBIX Server stopped. ZABBIX %s (revision %s).",
 
1324
                        ZABBIX_VERSION,
 
1325
                        ZABBIX_REVISION);
1321
1326
 
1322
1327
        exit(SUCCEED);
1323
1328
}