Hi,
here are 6 patches I made. The first two were findings from pylint, the rest
is a try to fix monitoring with postgres.
--
Regards
Michael Calmer
--------------------------------------------------------------------------
Michael Calmer
SUSE LINUX Products GmbH, Maxfeldstr. 5, D-90409 Nuernberg
T: +49 (0) 911 74053 0
F: +49 (0) 911 74053575 - e-mail: michael.cal...@suse.com
--------------------------------------------------------------------------
SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer
HRB 16746 (AG Nürnberg)
From ffc17d8bce7322d8108d55293dd6e411157d3196 Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Sun, 27 Nov 2011 15:35:12 +0100
Subject: [PATCH 1/6] add missing import
E:132,54:ConfigManagement.management_remove_channel: Undefined variable
'sys'
---
.../handlers/config_mgmt/rhn_config_management.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/backend/server/handlers/config_mgmt/rhn_config_management.py b/backend/server/handlers/config_mgmt/rhn_config_management.py
index d5287fc..ddf08c4 100644
--- a/backend/server/handlers/config_mgmt/rhn_config_management.py
+++ b/backend/server/handlers/config_mgmt/rhn_config_management.py
@@ -17,6 +17,7 @@
#
# $Id$
+import sys
import difflib
from spacewalk.common.rhnLog import log_debug
from spacewalk.common.rhnException import rhnFault
--
1.7.3.4
From 74c1d950d06fdaf7edf75beb2b795e72b5933576 Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Sun, 27 Nov 2011 15:36:23 +0100
Subject: [PATCH 2/6] fix typos in boolean variables
E:358,21:schedule_config_deploy: Undefined variable 'false'
E:361,29:schedule_config_deploy: Undefined variable 'true'
---
backend/server/rhnServer/server_kickstart.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/backend/server/rhnServer/server_kickstart.py b/backend/server/rhnServer/server_kickstart.py
index a33389f..7ba167b 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -355,10 +355,10 @@ def schedule_config_deploy(server_id, action_id, kickstart_session_id,
return aid
else:
tokens_obj = rhnFlags.get("registration_token")
- deployment = false
+ deployment = False
for token in tokens_obj.tokens:
if token['deploy_configs'] == 'Y':
- deployment = true
+ deployment = True
break
if not deployment:
return aid
--
1.7.3.4
From 54a13d06af07a1d86cde69719aff3179b70d59a4 Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Mon, 28 Nov 2011 16:13:43 +0100
Subject: [PATCH 3/6] specify missing param password
---
client/tools/osad/src/osa_dispatcher.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index 9f207af..967c77b 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -270,7 +270,7 @@ class Runner(jabber_lib.Runner):
""")
def _register_dispatcher(self, jabber_id, hostname, port):
- h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar' ))
+ h = rhnSQL.prepare(self._query_register_dispatcher, params = ( 'hostname_in varchar', 'port_in numeric', 'jabber_id_in varchar', 'password varchar' ))
h.execute(jabber_id_in=jabber_id, hostname_in=hostname, port_in=port, password=self._password)
rhnSQL.commit()
--
1.7.3.4
From ab387975796b4b04a4ccab2cd600f01d0b69db2a Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Mon, 28 Nov 2011 16:30:11 +0100
Subject: [PATCH 4/6] replace synonyms with real table names and change sysdate to current_timestamp
---
monitoring/PerlModules/NP/OracleDB/CF_DB.pm | 42 +++++++++++++-------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
index 4d25b0d..43a109b 100644
--- a/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
+++ b/monitoring/PerlModules/NP/OracleDB/CF_DB.pm
@@ -80,7 +80,7 @@ sub CQ_Commands {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "COMMAND_QUEUE_COMMANDS";
+ my $table = "RHN_COMMAND_QUEUE_COMMANDS";
my $idseq = "COMMAND_Q_COMMAND_RECID_SEQ.NEXTVAL";
my $keycol = 'RECID';
my @cols = qw(RECID DESCRIPTION
@@ -100,7 +100,7 @@ sub CQ_Commands {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -140,7 +140,7 @@ sub CQ_Instances {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "COMMAND_QUEUE_INSTANCES";
+ my $table = "RHN_COMMAND_QUEUE_INSTANCES";
my $idseq = "COMMAND_Q_INSTANCE_RECID_SEQ.NEXTVAL";
my $keycol = 'RECID';
my @cols = qw(RECID COMMAND_ID NOTES
@@ -158,7 +158,7 @@ sub CQ_Instances {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, 'sysdate', sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, 'current_timestamp', sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -197,7 +197,7 @@ sub CQ_Execs {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "COMMAND_QUEUE_EXECS";
+ my $table = "RHN_COMMAND_QUEUE_EXECS";
my $keycol = 'INSTANCE_ID,NETSAINT_ID';
my @cols = qw(INSTANCE_ID NETSAINT_ID TARGET_TYPE
DATE_ACCEPTED DATE_EXECUTED
@@ -212,7 +212,7 @@ sub CQ_Execs {
} elsif ($action eq 'insert') {
- push(@$whereclauses, 'sysdate');
+ push(@$whereclauses, 'current_timestamp');
} elsif ($action eq 'select') {
@@ -243,7 +243,7 @@ sub CQ_Params {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "COMMAND_QUEUE_PARAMS";
+ my $table = "RHN_COMMAND_QUEUE_PARAMS";
my $keycol = 'INSTANCE_ID,ORD';
my @cols = qw(INSTANCE_ID ORD VALUE);
@@ -278,7 +278,7 @@ sub CQ_Sessions {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "COMMAND_QUEUE_SESSIONS";
+ my $table = "RHN_COMMAND_QUEUE_SESSIONS";
my $keycol = 'CONTACT_ID';
my @cols = qw(CONTACT_ID SESSION_ID EXPIRATION_DATE
LAST_UPDATE_USER LAST_UPDATE_DATE);
@@ -289,7 +289,7 @@ sub CQ_Sessions {
} elsif ($action eq 'insert') {
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -329,7 +329,7 @@ sub Customer {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = 'CUSTOMER';
+ my $table = 'RHN_CUSTOMER_MONITORING';
my $idseq = 'CUSTOMER_RECID_SEQ.NEXTVAL';
my $keycol = 'RECID';
@@ -350,7 +350,7 @@ sub Customer {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -390,7 +390,7 @@ sub Netsaint {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = 'SAT_CLUSTER';
+ my $table = 'RHN_SAT_CLUSTER';
my $idseq = 'COMMAND_TARGET_RECID_SEQ.NEXTVAL';
my $keycol = 'RECID';
@@ -411,7 +411,7 @@ sub Netsaint {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -477,7 +477,7 @@ sub Node {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -513,7 +513,7 @@ sub LL_Netsaint {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = 'LL_NETSAINT';
+ my $table = 'RHN_LL_NETSAINT';
my $keycol = 'NETSAINT_ID';
my @cols = qw(NETSAINT_ID CITY);
my $idnum;
@@ -551,7 +551,7 @@ sub Contact {
my $bindvars = shift || [];
my $orderby = shift || [];
- my $table = "CONTACT";
+ my $table = "RHN_CONTACT_MONITORING";
my $idseq = "CONTACT_RECID_SEQ";
my $keycol = 'RECID';
my @cols = qw( RECID CUSTOMER_ID
@@ -580,7 +580,7 @@ sub Contact {
$idnum = $rv->[0]->[0];
unshift(@$whereclauses, '?');
unshift(@$bindvars, $idnum);
- push(@$whereclauses, sprintf("'%s'", $self->username), 'sysdate');
+ push(@$whereclauses, sprintf("'%s'", $self->username), 'current_timestamp');
} elsif ($action eq 'select') {
@@ -813,14 +813,14 @@ sub getUnexpiredCQ_Execs_by_instance_netsaint {
my $nsid = shift;
my $orderby = shift;
- my $tables = "command_queue_instances ins,command_queue_execs exec";
+ my $tables = "rhn_command_queue_instances ins,rhn_command_queue_execs exec";
my @execcols = (map("exec.$_", $self->CQ_Execs('columns')));
my @where = ("netsaint_id = ?",
"instance_id = ?",
"instance_id = ins.recid",
- "expiration_date > sysdate");
+ "expiration_date > current_timestamp");
my @bind = ($nsid, $iid);
@@ -962,7 +962,7 @@ sub getUnexpiredCQ_SessionBySessionId {
my($dataref, $ordref) =
$self->CQ_Sessions('select', ['session_id = ?',
- 'expiration_date > sysdate'], [$sid]);
+ 'expiration_date > current_timestamp'], [$sid]);
# This query should only return one row, so just return the record.
if (scalar(@$ordref)) {
@@ -1419,7 +1419,7 @@ sub get_sysdate {
#################
my $self = shift();
- my $statement = sprintf("SELECT TO_CHAR(sysdate, '%s') as current_time FROM dual",$self->dateformat);
+ my $statement = sprintf("SELECT TO_CHAR(current_timestamp, '%s') as current_time FROM dual",$self->dateformat);
my $ref = $self->dbexec($statement);
return $ref->[0]->[0];
--
1.7.3.4
From a0d8486b1449783c238e95a989324713e390ede1 Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Mon, 28 Nov 2011 17:08:11 +0100
Subject: [PATCH 6/6] postgres seems to reject empty text for stdout and stderr column
ERROR: new row for relation "rhn_command_queue_execs" violates check constraint "vn_rhn_command_queue_execs_stderr"
---
.../SputLite/html/cgi-bin/upload_results.cgi | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/monitoring/SputLite/html/cgi-bin/upload_results.cgi b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
index 913fa53..cf5794a 100755
--- a/monitoring/SputLite/html/cgi-bin/upload_results.cgi
+++ b/monitoring/SputLite/html/cgi-bin/upload_results.cgi
@@ -113,6 +113,7 @@ sub ProcessInput {
# Truncate to fit into a varchar2(4000)
$value = substr($value, 0, 3996) . '...' if (length($value) > 4000);
+ $value = ' ' if (length($value) == 0);
push(@values, "$field = ?");
push(@bindvars, $value);
--
1.7.3.4
From c3c8ca4a57843b2700f29ce19785067b817dfc80 Mon Sep 17 00:00:00 2001
From: Michael Calmer <m...@suse.de>
Date: Mon, 28 Nov 2011 16:44:24 +0100
Subject: [PATCH 5/6] replace sysdate with current_timestamp
---
.../SputLite/html/cgi-mod-perl/fetch_commands.cgi | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi b/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
index 6a2cea2..c42bcaa 100755
--- a/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
+++ b/monitoring/SputLite/html/cgi-mod-perl/fetch_commands.cgi
@@ -151,7 +151,7 @@ if( defined $clusterid ) {
# Update the command_queue_execs table to indicate that the
# satellite has downloaded the commands
- my $rv = $CF_DB->updateCQ_Exec($iid, $clusterid, 'cluster', ['date_accepted = sysdate']);
+ my $rv = $CF_DB->updateCQ_Exec($iid, $clusterid, 'cluster', ['date_accepted = current_timestamp']);
}
}
@@ -164,7 +164,7 @@ if( defined $clusterid ) {
# Update the command_queue_execs table to indicate that the
# satellite has downloaded the commands
- my $rv = $CF_DB->updateCQ_Exec($iid, $nodeid, 'node', ['date_accepted = sysdate']);
+ my $rv = $CF_DB->updateCQ_Exec($iid, $nodeid, 'node', ['date_accepted = current_timestamp']);
}
print "</COMMANDS>\n";
--
1.7.3.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
