monitoring/PerlModules/NP/OracleDB/CF_DB.pm | 1 +
monitoring/nocpulse-common/nocpulse-common.spec | 11 ++++++++++-
rel-eng/packages/nocpulse-common | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 0b5f87c45cdecd0d7aaaf061f412724df1f42e3e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 18 15:41:33 2011 +0100
Automatic commit of package [nocpulse-common] release [2.1.22-1].
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec
b/monitoring/nocpulse-common/nocpulse-common.spec
index a9f61c6..0dfef27 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -1,5 +1,5 @@
Name: nocpulse-common
-Version: 2.1.21
+Version: 2.1.22
Release: 1%{?dist}
Summary: NOCpulse common
License: GPLv2
@@ -146,6 +146,14 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Mar 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.1.22-1
+- fixed ownership of NOCpulse/tmp directory
+- fixed function decode does not exist (PG)
+- fixed relation "config_parameter" does not exist (PG)
+- fixed relation "config_group" does not exist (PG)
+- fixed relation "config_macro" does not exist (PG)
+- reuse RHN:DB for db connection in monitoring (PG)
+
* Wed Mar 02 2011 Michael Mraka <michael.mraka(a)redhat.com> 2.1.21-1
- 493028 - directory for notifications should be created
diff --git a/rel-eng/packages/nocpulse-common b/rel-eng/packages/nocpulse-common
index 555120b..cd14a81 100644
--- a/rel-eng/packages/nocpulse-common
+++ b/rel-eng/packages/nocpulse-common
@@ -1 +1 @@
-2.1.21-1 monitoring/nocpulse-common/
+2.1.22-1 monitoring/nocpulse-common/
commit 89f98593cd632a077f9f25201b707d021e281f19
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 18 15:33:38 2011 +0100
fixed ownership of NOCpulse/tmp directory
diff --git a/monitoring/nocpulse-common/nocpulse-common.spec
b/monitoring/nocpulse-common/nocpulse-common.spec
index 369fab0..a9f61c6 100644
--- a/monitoring/nocpulse-common/nocpulse-common.spec
+++ b/monitoring/nocpulse-common/nocpulse-common.spec
@@ -131,6 +131,7 @@ fi
%dir %{_sysconfdir}/nocpulse
%config(missingok,noreplace) %{_sysconfdir}/%{package_name}/NOCpulse.ini
%{_sysconfdir}/%{package_name}/NOCpulse
+%attr(-, %{package_name},%{package_name}) %{_sysconfdir}/%{package_name}/NOCpulse/tmp
%config(missingok,noreplace) %attr(-, %{package_name},%{package_name})
%{_var}/lib/%{package_name}/.forward
%{_bindir}/npConfigValue
%dir %{perl_vendorlib}/NOCpulse
commit 03b6f8109f96eb37955cae4c4497241e007aa2d4
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Mar 18 10:13:57 2011 +0100
fixed input values (PG)
fixing
ERROR: invalid input syntax for integer: "NULL"
STATEMENT: SELECT
instance_id,netsaint_id,command_line,effective_user,effective_gro
up,restartable,notify_email,timeout,target_type,TO_CHAR(expiration_date, 'YYYY MM
DD HH2
4 MI SS')
FROM rhn_command_queue_commands cmd, rhn_command_queue_instances ins,
rhn_
command_queue_execs exec
WHERE netsaint_id = $1 AND target_type = $2 AND exec.instance_id = ins.recid
AND
ins.command_id = cmd.recid AND date_executed is null AND expiration_date >
current_time
stamp
ERROR: invalid input syntax for integer: ""
STATEMENT: SELECT
instance_id,netsaint_id,command_line,effective_user,effective_group,restartable,notify_email,timeout,target_type,TO_CHAR(expiration_date,
'YYYY MM DD HH24 MI SS')
...
diff --git a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
index 1895796..4d25b0d 100644
--- a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
+++ b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
@@ -885,6 +885,7 @@ $self->dprint(1, "*** *** DATEFORMAT IS: ",
$self->dateformat, " *** ***");
"date_executed is null",
"expiration_date > current_timestamp");
+ $nsid = ($nsid eq 'NULL' or $nsid eq '' ? undef : $nsid);
my @bind = ($nsid, $type);
my ($dataref, $ordref) = $self->TableOp($tables, \@cols, 'instance_id',