tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2009-04-16 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* lib/PandoraFMS/ReconServer.pm: Fixed a typo that made the server go
          down.

        * bin/pandora_server: Prevent alarm from bombing the main thread when
          called within a thread.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2009-04-16 09:18:18 +00:00
parent 0207651a64
commit a56d982475
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_server/ChangeLog
View File

@ -1,3 +1,11 @@
2009-04-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/ReconServer.pm: Fixed a typo that made the server go
down.
* bin/pandora_server: Prevent alarm from bombing the main thread when
called within a thread.
2009-04-14 Ramon Novoa <rnovoa@artica.es> 2009-04-14 Ramon Novoa <rnovoa@artica.es>
* pandora_ctl, pandora_network, pandora_wmi, pandora_plugin, * pandora_ctl, pandora_network, pandora_wmi, pandora_plugin,

3
pandora_server/bin/pandora_server
View File

@ -60,6 +60,9 @@ sub pandora_shutdown () {
$SIG{'TERM'} = 'pandora_shutdown'; $SIG{'TERM'} = 'pandora_shutdown';
$SIG{'INT'} = 'pandora_shutdown'; $SIG{'INT'} = 'pandora_shutdown';
# Prevent alarm from bombing the main thread when called within a thread
$SIG{'ALRM'} = 'IGNORE';
# Initialize # Initialize
pandora_init(\%Config, 'Pandora FMS Server'); pandora_init(\%Config, 'Pandora FMS Server');
pandora_load_config (\%Config); pandora_load_config (\%Config);

2
pandora_server/lib/PandoraFMS/ReconServer.pm
View File

@ -220,7 +220,7 @@ sub icmp_scan ($$) {
# TCP scan the given host/port. Returns 1 if successful, 0 otherwise. # TCP scan the given host/port. Returns 1 if successful, 0 otherwise.
############################################################################## ##############################################################################
sub tcp_scan ($$$) { sub tcp_scan ($$$) {
my ($host, $timeout, $port) = $@; my ($host, $timeout, $port) = @_;
my $rc = 0; my $rc = 0;
eval { eval {