Quick Links

Propsed pgagent patch: pgAgent reports failure upon success - For Review

From:	"Martin French" <Martin(dot)French(at)romaxtech(dot)com>
To:	pgadmin-hackers(at)postgresql(dot)org
Cc:	dpage(at)pgadmin(dot)org
Subject:	Propsed pgagent patch: pgAgent reports failure upon success - For Review
Date:	2012-07-16 13:46:50
Message-ID:	OF1A71C687.E0A5A19F-ON80257A3D.004B2F8F-80257A3D.004BB29F@LocalDomain
Views:	Raw Message \| Whole Thread \| Download mbox \| Resend email
Thread:
Lists:	pgadmin-hackers

<html><body><tt>Hi, </tt> <tt>I have attempted a patch for an issue where pgAgent incorrectly reports failure on a plain SQL job. Please see below.</tt> <tt>Feedback/comments welcome.</tt> <tt>Thanks</tt> <tt>Martin French.</tt> <tt>diff --git a/connection.cpp b/connection.cpp index 5e10078..6103c00 100644 --- a/connection.cpp +++ b/connection.cpp @@ -336,6 +336,7 @@ DBresult::DBresult(DBconn *conn, const wxString &query) if (result) { int rc = PQresultStatus(result); + conn->SetLastResult(rc); if (rc == PGRES_TUPLES_OK) maxRows = PQntuples(result); else if (rc != PGRES_COMMAND_OK) diff --git a/include/connection.h b/include/connection.h index 04087db..3cd1c0d 100644 --- a/include/connection.h +++ b/include/connection.h @@ -51,7 +51,33 @@ public: { return conn != 0; } - +        bool LastCommandOk() +        { +                return IsCommandOk((ExecStatusType)lastResult); +        } +        bool IsCommandOk(ExecStatusType ret) +        { +                switch (ret) +                { +                        case PGRES_COMMAND_OK: +                        case PGRES_TUPLES_OK: +                        case PGRES_COPY_OUT: +                        case PGRES_COPY_IN: +                        case PGRES_COPY_BOTH: +                                return true; +                        default: +                                return false; +                }; +        } +        void SetLastResult(int res) +        { +                lastResult = res; +        } +        int GetLastResult() +        { +                return lastResult; +        } + DBresult *Execute(const wxString &query); wxString ExecuteScalar(const wxString &query); int ExecuteVoid(const wxString &query); @@ -70,7 +96,7 @@ protected: PGconn *conn; DBconn *next, *prev; bool inUse; - + int lastResult; friend class DBresult; }; diff --git a/job.cpp b/job.cpp index 9a5bb08..ba270be 100644 --- a/job.cpp +++ b/job.cpp @@ -80,6 +80,7 @@ Job::~Job() int Job::Execute() { int rc = 0; + bool succeeded = false; DBresult *steps = threadConn->Execute(                       wxT("SELECT * ")                       wxT("  FROM pgagent.pga_jobstep ") @@ -138,13 +139,14 @@ int Job::Execute() { LogMessage(wxString::Format(_("Executing SQL step %s (part of job %s)"), stepid.c_str(), jobid.c_str()), LOG_DEBUG); rc = stepConn->ExecuteVoid(steps->GetString(wxT("jstcode"))); + succeeded = stepConn->LastCommandOk(); output = stepConn->GetLastError(); stepConn->Return(); } else { output = _("Couldn't get a connection to the database!"); - rc = -1; + succeeded = false; } @@ -292,6 +294,9 @@ int Job::Execute() rc = WEXITSTATUS(rc); else rc = -1; + // set success status for batch runs, be pessimistic bt default + if (rc == 0) + succeeded = true; #endif // Delete the file/directory. If we fail, don't overwrite the script output in the log, just throw warnings. @@ -319,7 +324,7 @@ int Job::Execute() } wxString stepstatus; - if (rc == 0) + if (succeeded) stepstatus = wxT("s"); else stepstatus = steps->GetString(wxT("jstonerror")); </tt>=============================================

Romax Technology Limited
Rutherford House
Nottingham Science & Technology Park
Nottingham,
NG7 2PZ
England

Telephone numbers:
+44 (0)115 951 88 00 (main)

For other office locations see:
http://www.romaxtech.com/Contact
=================================
===============
E-mail: info(at)romaxtech(dot)com
Website: www.romaxtech.com
=================================

================
Confidentiality Statement
This transmission is for the addressee only and contains information that is confidential and privileged.
Unless you are the named addressee, or authorised to receive it on behalf of the addressee
you may not copy or use it, or disclose it to anyone else.
If you have received this transmission in error please delete from your system and contact the sender. Thank you for your cooperation.
=================================================
</body></html>

Attachment	Content-Type	Size
unknown_filename	text/html	7.9 KB

Responses

Re: Propsed pgagent patch: pgAgent reports failure upon success - For Review at 2012-07-16 14:52:45 from Dave Page

Browse pgadmin-hackers by date

	From	Date	Subject
Next Message	Dave Page	2012-07-16 14:52:45	Re: Propsed pgagent patch: pgAgent reports failure upon success - For Review
Previous Message	Akshay Joshi	2012-07-16 10:03:50	Fixed pgAdmin3 folder hierarchy