2 commits - monitoring/status_log_acceptor

[Jan Pazdziora]

monitoring/status_log_acceptor/AcceptStatusLog.pm |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 8043c46bba5867a9558d8ea21a4c9f4eb0174223
Author: Jan Pazdziora 
Date:   Wed Feb 1 15:25:43 2012 +0100

Fixing inserts and updates for RHN_PROBE_STATE and RHN_SATELLITE_STATE.

Addressing
    ERROR:  relation "probe_state" does not exist
    	LINE 2:       UPDATE PROBE_STATE
    	                     ^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 64.
    ERROR:  relation "satellite_state" does not exist
    	LINE 1: UPDATE SATELLITE_STATE SET LAST_CHECK = SYSDATE,
    	               ^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 122.
    ERROR:  column "sysdate" does not exist
    	LINE 1: UPDATE RHN_SATELLITE_STATE SET LAST_CHECK = SYSDATE,
    	                                                    ^ at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 122.\n\n

diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index d7e3073..bc17fec 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -22,7 +22,7 @@ sub store_probe_state
     # print "storing probe state...\n";

my $update_probe = $cs_dbh->prepare(q{
-      UPDATE PROBE_STATE 
+      UPDATE RHN_PROBE_STATE
       SET    LAST_CHECK = TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'),
              STATE = ?,
              OUTPUT = ?
@@ -31,7 +31,7 @@ sub store_probe_state
     });

my $insert_probe = $cs_dbh->prepare(q{
-      INSERT INTO PROBE_STATE 
+      INSERT INTO RHN_PROBE_STATE
         (LAST_CHECK, STATE, OUTPUT, SCOUT_ID, PROBE_ID) 
       VALUES 
         (TO_DATE(?, 'YYYY-MM-DD HH24:MI:SS'), ?, ?, ?, ?)
@@ -96,11 +96,11 @@ sub store_program
                      min_latency avg_latency );

my $update_sql = 
-        "UPDATE SATELLITE_STATE SET LAST_CHECK = SYSDATE";
+        "UPDATE RHN_SATELLITE_STATE SET LAST_CHECK = CURRENT_TIMESTAMP";

my $insert_sql = sprintf(
-       "INSERT INTO SATELLITE_STATE (SATELLITE_ID, LAST_CHECK, %s) " . 
-       "VALUES (?, SYSDATE", join(",\n", @params));
+       "INSERT INTO RHN_SATELLITE_STATE (SATELLITE_ID, LAST_CHECK, %s) " .
+       "VALUES (?, CURRENT_TIMESTAMP", join(",\n", @params));

my @bindvars;

commit 82e510254d5ab8a95e8427083f3b7ca4afc075f9
Author: Jan Pazdziora 
Date:   Wed Feb 1 15:24:28 2012 +0100

Use RHN::DBI instead of plain DBI with sc_db login parameters.

Addressing
    Error while processing status log: Can't connect to current state database:  at /usr/share/perl5/vendor_perl/NOCpulse/AcceptStatusLog.pm line 216.

diff --git a/monitoring/status_log_acceptor/AcceptStatusLog.pm b/monitoring/status_log_acceptor/AcceptStatusLog.pm
index 7ee1a0a..d7e3073 100644
--- a/monitoring/status_log_acceptor/AcceptStatusLog.pm
+++ b/monitoring/status_log_acceptor/AcceptStatusLog.pm
@@ -3,7 +3,7 @@ package NOCpulse::AcceptStatusLog;

use strict;

-use DBI;
+use RHN::DBI;
 use CGI;
 use NOCpulse::Config;
 use LWP::UserAgent;
@@ -206,10 +206,7 @@ sub handler
    {
        # print "connecting to current state database...\n";
        
-	    $cs_dbh = DBI->connect("DBI:$cs_dbd:$cs_dbname",
-				   $cs_dbuname,
-				   $cs_dbpass,
-				   { RaiseError => 1, AutoCommit => 0 });
+	    $cs_dbh = RHN::DBI->connect();
    };
    if( not defined $cs_dbh )
    {