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

2010-01-21 Sancho Lerena <slerena@artica.es> 

* pandora_server.spec: Fixed spec to be more compatible with other
        RPM distros.

        * lib/PandoraFMS/NetworkServer.pm: Fixed ugly/noisy message "Use of
        uninitialized value $output in string eq at /usr/local/share/perl
        /5.10.0/PandoraFMS/NetworkServer.pm line 268".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2299 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
slerena 2010-01-22 14:24:56 +00:00
parent e7ee2dc47c
commit 0532888891
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/ChangeLog
View File

@ -1,3 +1,12 @@
2010-01-21 Sancho Lerena <slerena@artica.es>
* pandora_server.spec: Fixed spec to be more compatible with other
RPM distros.
* lib/PandoraFMS/NetworkServer.pm: Fixed ugly/noisy message "Use of
uninitialized value $output in string eq at /usr/local/share/perl
/5.10.0/PandoraFMS/NetworkServer.pm line 268".
2010-01-21 Pablo de la Concepción <pablo.concepcion@artica.es> 2010-01-21 Pablo de la Concepción <pablo.concepcion@artica.es>
* lib/PandoraFMS/Core.pm: Modified to unify create and update functions * lib/PandoraFMS/Core.pm: Modified to unify create and update functions

3
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -264,7 +264,8 @@ sub pandora_query_snmp (%$$$$$) {
$_[5] = 0; $_[5] = 0;
my $snmpget_cmd = $pa_config->{"snmpget"}; my $snmpget_cmd = $pa_config->{"snmpget"};
my $output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c $snmp_community $snmp_target $snmp_oid 2>/dev/null`; my $output = "";
$output = `$snmpget_cmd -v $snmp_version -r $snmp_retries -t $snmp_timeout -OUevqt -c $snmp_community $snmp_target $snmp_oid 2>/dev/null`;
if ($output eq ""){ if ($output eq ""){
$_[5] = 1; $_[5] = 1;
} }

8
pandora_server/pandora_server.spec
View File

@ -81,8 +81,8 @@ fi
exit 0 exit 0
%post %post
chkconfig -s pandora_server on chkconfig pandora_server on
chkconfig -s tentacle_serverd on chkconfig tentacle_serverd on
echo "/usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" > /etc/cron.daily/pandora_db echo "/usr/share/pandora_server/util/pandora_db.pl /etc/pandora/pandora_server.conf" > /etc/cron.daily/pandora_db
chmod 750 /etc/cron.daily/pandora_db chmod 750 /etc/cron.daily/pandora_db
@ -107,8 +107,8 @@ echo "data using tentacle"
%preun %preun
/etc/init.d/pandora_server stop &>/dev/null /etc/init.d/pandora_server stop &>/dev/null
/etc/init.d/tentacle_serverd stop &>/dev/null /etc/init.d/tentacle_serverd stop &>/dev/null
chkconfig -d pandora_server chkconfig --del pandora_server
chkconfig -d tentacle_serverd chkconfig --del tentacle_serverd
%postun %postun
rm -Rf /etc/init.d/tentacle_serverd rm -Rf /etc/init.d/tentacle_serverd