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

2008-10-30 Sancho Lerena <slerena@gmail.com>

Browse Source 
* lib/PandoraFMS/DB.pm:  Some people reports problems with
        server stop detection. This could help, because has optimized
        way to detect servers, but is not a bugfix because I cannot
        reproduce the problem.

        * Config.pm: Updated version (2.1)

        * server/Launcher scripts: Updated version (2.1)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1205 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2008-10-30 13:15:18 +00:00
parent 6ce0966725
commit 1a144f11cb
9 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_server/ChangeLog
View File

@ -1,3 +1,14 @@
2008-10-30 Sancho Lerena <slerena@gmail.com>
* lib/PandoraFMS/DB.pm: Some people reports problems with
server stop detection. This could help, because has optimized
way to detect servers, but is not a bugfix because I cannot
reproduce the problem.
* Config.pm: Updated version.
* server/Launcher scripts: Updated version.
2008-10-22 Evi Vanoost <vanooste@rcbi.rochester.edu> 2008-10-22 Evi Vanoost <vanooste@rcbi.rochester.edu>
* bin/pandora_snmpconsole: Feature request #2166257 * bin/pandora_snmpconsole: Feature request #2166257

4
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -38,8 +38,8 @@ our @EXPORT = qw(
# There is no global vars, all variables (setup) passed as hash reference # There is no global vars, all variables (setup) passed as hash reference
# version: Defines actual version of Pandora Server for this module only # version: Defines actual version of Pandora Server for this module only
my $pandora_version = "2.0"; my $pandora_version = "2.1-dev";
my $pandora_build="PS081014"; my $pandora_build="PS081030";
our $VERSION = $pandora_version." ".$pandora_build; our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash # Setup hash

14
pandora_server/lib/PandoraFMS/DB.pm
View File

@ -1302,7 +1302,8 @@ sub pandora_serverkeepaliver (%$$) {
$temp = $pa_config->{"keepalive_orig"} * 2; # Down if keepalive x 2 seconds unknown $temp = $pa_config->{"keepalive_orig"} * 2; # Down if keepalive x 2 seconds unknown
my $fecha_limite = DateCalc($timestamp,"- $temp seconds",\$err); my $fecha_limite = DateCalc($timestamp,"- $temp seconds",\$err);
$fecha_limite = &UnixDate($fecha_limite,"%Y-%m-%d %H:%M:%S"); $fecha_limite = &UnixDate($fecha_limite,"%Y-%m-%d %H:%M:%S");
my $query_idag = "SELECT * FROM tserver WHERE keepalive < '$fecha_limite'";
my $query_idag = "SELECT * FROM tserver WHERE status = 1 AND keepalive < '$fecha_limite'";
my $s_idag = $dbh->prepare($query_idag); my $s_idag = $dbh->prepare($query_idag);
$s_idag ->execute; $s_idag ->execute;
if ($s_idag->rows != 0) { if ($s_idag->rows != 0) {
@ -1313,19 +1314,16 @@ sub pandora_serverkeepaliver (%$$) {
my $sql_update = "UPDATE tserver SET status = 0, version = '".$version_data."' WHERE id_server = $data[0]"; my $sql_update = "UPDATE tserver SET status = 0, version = '".$version_data."' WHERE id_server = $data[0]";
$dbh->do($sql_update); $dbh->do($sql_update);
pandora_event ($pa_config, "Server ".$data[1]." going Down", 0, 0, 4, 0, 0, "system", $dbh);
pandora_event ($pa_config, "Server ".$data[1]." going Down", 0, logger( $pa_config, "Server ".$data[1]." going Down ", 1);
0, 4, 0, 0, "system", $dbh);
logger( $pa_config, "Server ".$data[1]." going Down ",1);
} }
} }
} }
$s_idag->finish(); $s_idag->finish();
# Update my server
$pa_config->{"keepalive"} = $pa_config->{"keepalive_orig"}; $pa_config->{"keepalive"} = $pa_config->{"keepalive_orig"};
} else {
$pa_config->{"keepalive"} = $pa_config->{"keepalive"} - $pa_config->{"server_threshold"};
} }
$pa_config->{"keepalive"} = $pa_config->{"keepalive"} - $pa_config->{"server_threshold"};
} }
########################################################################## ##########################################################################

3
pandora_server/pandora_network
View File

@ -3,7 +3,7 @@
# Pandora FMS Network Server, startup script # Pandora FMS Network Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -64,6 +64,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)

3
pandora_server/pandora_plugin
View File

@ -3,7 +3,7 @@
# Pandora FMS Plugin Server, startup script # Pandora FMS Plugin Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -62,6 +62,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)

3
pandora_server/pandora_prediction
View File

@ -3,7 +3,7 @@
# Pandora FMS Prediction Server, startup script # Pandora FMS Prediction Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -64,6 +64,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)

3
pandora_server/pandora_recon
View File

@ -3,7 +3,7 @@
# Pandora FMS Recon Server, startup script # Pandora FMS Recon Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -62,6 +62,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)

3
pandora_server/pandora_server
View File

@ -3,7 +3,7 @@
# Pandora FMS Data Server, startup script # Pandora FMS Data Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -64,6 +64,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)

3
pandora_server/pandora_wmi
View File

@ -3,7 +3,7 @@
# Pandora FMS WMI Server, startup script # Pandora FMS WMI Server, startup script
# Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com> # Copyright (c) 2006-2008 Sancho Lerena, <slerena@gmail.com>
# Linux Version (generic) # Linux Version (generic)
# v2.0 Build 080903 # v2.1 Build 081030
# http://www.pandorafms.com # http://www.pandorafms.com
# Configurable path and filenames # Configurable path and filenames
@ -62,6 +62,7 @@ case "$1" in
;; ;;
force-reload|restart) force-reload|restart)
$0 stop $0 stop
sleep 2
$0 start $0 start
;; ;;
*) *)