tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-25 Ramon Novoa <rnovoa@artica.es> 

* bin/pandora_server: Delay the backgrounding of the main process to
	  make log messages available when starting from the init script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7714 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2013-02-25 14:36:01 +00:00
parent 9076d45d2b
commit 24361cdfb2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-02-25 Ramon Novoa <rnovoa@artica.es>
* bin/pandora_server: Delay the backgrounding of the main process to
make log messages available when starting from the init script.
2013-02-25 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/Core.pm: erased the spam traces (useful for the

12
pandora_server/bin/pandora_server
View File

@ -266,12 +266,6 @@ if (enterprise_load (\%Config) == 0) {
print_message (\%Config, " [*] Pandora FMS Enterprise module loaded.", 1);
}
# Daemonize and put in background
if ($Config{'daemon'} == 1) {
print_message (\%Config, " [*] Backgrounding Pandora FMS Server process.\n", 1);
pandora_daemonize (\%Config);
}
if (enterprise_load (\%Config) != 0) {
if($Config{'policy_manager'} == 1) {
# Start thread to patrol policy queue
@ -292,6 +286,12 @@ foreach my $server (@Servers) {
$server->upEvent ();
}
# Daemonize and put in background
if ($Config{'daemon'} == 1) {
print_message (\%Config, " [*] Backgrounding Pandora FMS Server process.\n", 1);
pandora_daemonize (\%Config);
}
# Main loop
my $time_ref = time ();
my $counter = 0;