2010-05-19 Ramon Novoa <rnovoa@artica.es>

* lib/PandoraFMS/SNMPServer.pm, lib/PandoraFMS/Config.pm,
          lib/PandoraFMS/Server.pm, lib/PandoraFMS/NetworkServer.pm,
          lib/PandoraFMS/GIS.pm, lib/PandoraFMS/WMIServer.pm,
          lib/PandoraFMS/PluginServer.pm, lib/PandoraFMS/ProducerConsumerServer.pm,
          lib/PandoraFMS/PredictionServer.pm, lib/PandoraFMS/Core.pm,
          lib/PandoraFMS/ReconServer.pm, lib/PandoraFMS/DataServer.pm,
          bin/pandora_server, util/pandora_db.pl, util/gpx2pandora_agent_data.pl,
          util/pandora_manage.pl, util/pandora_dbstress.pl: Added the default library path
          used by RPM and DEB packages.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_server/ChangeLog

@@ -1,3 +1,15 @@
+2010-05-19  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/SNMPServer.pm, lib/PandoraFMS/Config.pm,
+	  lib/PandoraFMS/Server.pm, lib/PandoraFMS/NetworkServer.pm,
+	  lib/PandoraFMS/GIS.pm, lib/PandoraFMS/WMIServer.pm,
+	  lib/PandoraFMS/PluginServer.pm, lib/PandoraFMS/ProducerConsumerServer.pm,
+	  lib/PandoraFMS/PredictionServer.pm, lib/PandoraFMS/Core.pm,
+	  lib/PandoraFMS/ReconServer.pm, lib/PandoraFMS/DataServer.pm,
+	  bin/pandora_server, util/pandora_db.pl, util/gpx2pandora_agent_data.pl,
+	  util/pandora_manage.pl, util/pandora_dbstress.pl: Added the default library path
+	  used by RPM and DEB packages.
+
 2010-05-19  Sancho Lerena <slerena@artica.es>
 
 	* lib/PandoraFMS/DataServer.pm: XML data files coming from a disabled

pandora_server/bin/pandora_server

@@ -21,6 +21,9 @@ use strict;
 use warnings;
 use POSIX qw(strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 # Pandora Modules
 use PandoraFMS::DB;
 use PandoraFMS::Config;

pandora_server/lib/PandoraFMS/Config.pm

@@ -20,6 +20,10 @@ package PandoraFMS::Config;
 use warnings;
 use POSIX qw(strftime);
 use Time::Local;
+
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;
@@ -297,14 +301,19 @@ sub pandora_load_config {
 	}
 
 	# Check for file
-	if ( ! -e $archivo_cfg ) {
+	if ( ! -f $archivo_cfg ) {
 		printf "\n [ERROR] Cannot open configuration file at $archivo_cfg. \n";
 		printf "	Please specify a valid Pandora FMS configuration file in command line. \n";
 		print "	Standard configuration file is at /etc/pandora/pandora_server.conf \n";
 		exit 1;
 	}
+
 	# Collect items from config file and put in an array 
-	open (CFG, "< $archivo_cfg");
+	if (! open (CFG, "< $archivo_cfg")) {
+		print "[ERROR] Error opening configuration file $archivo_cfg: $!.\n";
+		exit 1;
+	}
+
 	while (<CFG>){
 		$buffer_line = $_;
 		if ($buffer_line =~ /^[a-zA-Z]/){ # begins with letters

pandora_server/lib/PandoraFMS/Core.pm

@@ -109,6 +109,9 @@ use HTML::Entities;
 use Time::Local;
 use POSIX qw(strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::DB;
 use PandoraFMS::Config;
 use PandoraFMS::Tools;

pandora_server/lib/PandoraFMS/DataServer.pm

@@ -28,6 +28,9 @@ use Time::Local;
 use XML::Simple;
 use POSIX qw(setsid strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/GIS.pm

@@ -55,6 +55,9 @@ Exported Functions:
 use strict;
 use warnings;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::DB;
 use PandoraFMS::Tools;
 # TODO:Test if is instaled 

pandora_server/lib/PandoraFMS/NetworkServer.pm

@@ -27,6 +27,9 @@ use Thread::Semaphore;
 use IO::Socket::INET;
 use POSIX qw(strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/PluginServer.pm

@@ -27,6 +27,9 @@ use Thread::Semaphore;
 use POSIX qw(strftime);
 use HTML::Entities;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/PredictionServer.pm

@@ -28,6 +28,9 @@ use IO::Socket::INET;
 use Net::Ping;
 use POSIX qw(strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/ProducerConsumerServer.pm

@@ -24,6 +24,9 @@ use threads;
 use threads::shared;
 use Thread::Semaphore;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::DB;
 use PandoraFMS::Core;
 use PandoraFMS::Server;

pandora_server/lib/PandoraFMS/ReconServer.pm

@@ -28,6 +28,9 @@ use IO::Socket::INET;
 use NetAddr::IP;
 use POSIX qw(strftime ceil);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/SNMPServer.pm

@@ -27,6 +27,9 @@ use Thread::Semaphore;
 use Time::Local;
 use XML::Simple;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/lib/PandoraFMS/Server.pm

@@ -23,6 +23,9 @@ use warnings;
 use threads;
 use threads::shared;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::DB;
 use PandoraFMS::Core;
 

pandora_server/lib/PandoraFMS/WMIServer.pm

@@ -27,6 +27,9 @@ use Thread::Semaphore;
 use POSIX qw(strftime);
 use HTML::Entities;
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
 use PandoraFMS::Core;

pandora_server/util/gpx2pandora_agent_data.pl

@@ -8,11 +8,15 @@ use strict;
 use warnings;
 
 use XML::Simple;
-use PandoraFMS::Tools;
 use Data::Dumper;
 use Sys::Hostname;
 use POSIX qw(strftime);
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
+use PandoraFMS::Tools;
+
 use constant AGENT_VERSION => '3.1';
 
 

pandora_server/util/pandora_db.pl

@@ -21,9 +21,13 @@
 use strict;
 use Time::Local;		# DateTime basic manipulation
 use DBI;				# DB interface with MySQL
+use POSIX qw(strftime);
+
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
-use POSIX qw(strftime);
 
 # version: define current version
 my $version = "3.1 PS100310";

pandora_server/util/pandora_dbstress.pl

@@ -33,6 +33,9 @@ use strict;
 use DBI;			# DB interface with MySQL
 use Math::Trig;			# Math functions
 
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 # Pandora Modules
 use PandoraFMS::Config;
 use PandoraFMS::Tools;

pandora_server/util/pandora_manage.pl

@@ -13,9 +13,13 @@
 use strict;
 use Time::Local;		# DateTime basic manipulation
 use DBI;				# DB interface with MySQL
+use POSIX qw(strftime);
+
+# Default lib dir for RPM and DEB packages
+use lib '/usr/lib/perl5';
+
 use PandoraFMS::Tools;
 use PandoraFMS::DB;
-use POSIX qw(strftime);
 
 # version: define current version
 my $version = "3.1 PS100519";