monitoring/SatConfig/generator/GenerateConfig.pm | 4 ++--
web/modules/rhn/RHN/DB.pm | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 4a855ee10d5dd0527691dacec424896048563c5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:40:35 2011 +0200
Fixing set_err invocation to match the prototype.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: DBI set_err: invalid number of
arguments: got handle + 1, expected handle + between 2 and 5
Usage: $h->set_err($err, $errmsg [, $state, $method, $rv]) at
/usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm line 373.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 6c60b7c..10337ff 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -370,7 +370,7 @@ sub disconnect {
my $dbh = shift;
if ($dbh->{private_from_cache}) {
- $dbh->set_err("Can't disconnect cache-loaded RHN::DB handle");
+ $dbh->set_err(99999, "Can't disconnect cache-loaded RHN::DB
handle");
}
else {
$dbh->SUPER::disconnect(@_);
@@ -533,7 +533,7 @@ sub execute_h {
my $self = shift;
my @params = @_;
- $self->set_err("Odd number of params to execute_h") if @params % 2;
+ $self->set_err(99998, "Odd number of params to execute_h") if @params %
2;
while (my ($k, $v) = (splice @params, 0, 2, ())) {
commit dd69d8fe96a1337a65d8d645f9ecd0d9b05342d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 2 16:37:19 2011 +0200
Since RHN::DB sets FetchHashKeyName to NAME_uc and monitoring now uses RHN::DB, the
column name is now uppercase.
Addressing
ERROR: Spacewalk 1: Cannot generate configuration: Message
SatClusterRecord::get_physical_location_name() not understood
TRACEBACK:
at /usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 443
NOCpulse::Object::doesNotUnderstand('SatClusterRecord=HASH(0x2aae515d6fc0)',
'SatClusterRecord', 'get_physical_location_name') called at
/usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/Object.pm line 463
NOCpulse::Object::AUTOLOAD('SatClusterRecord=HASH(0x2aae515d6fc0)') called at
/usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 44
eval {...} called at
/usr/lib/perl5/vendor_perl/5.8.8/NOCpulse/SatConfig/GenerateConfig.pm line 19
NOCpulse::SatConfig::GenerateConfig::handler('Apache2::RequestRec=SCALAR(0x2aae5a006a50)')
called at -e line 0
eval {...} called at -e line 0
diff --git a/monitoring/SatConfig/generator/GenerateConfig.pm
b/monitoring/SatConfig/generator/GenerateConfig.pm
index 46e2b66..1c27509 100644
--- a/monitoring/SatConfig/generator/GenerateConfig.pm
+++ b/monitoring/SatConfig/generator/GenerateConfig.pm
@@ -24,7 +24,7 @@ sub handler {
SatClusterRecord->LoadFromSqlWithBind(q{
select sat_cluster.recid, sat_cluster.customer_id,
- location_name "physical_location_name",
+ location_name as physical_location_name,
sat_node.max_concurrent_checks, sat_node.sched_log_level,
sat_node.sput_log_level, sat_node.dq_log_level
from sat_cluster, sat_node, physical_location
@@ -41,7 +41,7 @@ sub handler {
my $satCluster = SatClusterRecord->InstancesList->[0];
my $customerId = $satCluster->get_CUSTOMER_ID;
- my $location = $satCluster->get_physical_location_name;
+ my $location = $satCluster->get_PHYSICAL_LOCATION_NAME;
# Get the auto_update flag
CFDBRecord->LoadFromSqlWithBind(q{
Show replies by thread