oc-cdtapi 3.17.1__py3-none-any.whl → 3.18.2__py3-none-any.whl

oc_cdtapi/PgQAPI.py

@@ -102,7 +102,7 @@ class PgQAPI (object):
     def get_msg(self, message_id):
         logging.debug('reached get_msg')
         logging.debug('getting status of message [%s]' % message_id)
-        ds = self.exec_select('select status, payload from queue_message where id = %s', (str(message_id) ) )
+        ds = self.exec_select('select status, payload from queue_message where id = %s', (str(message_id), ) )
         if ds:
             logging.debug('message found, returning [%s]', ds[0])
             return ds[0]
@@ -140,6 +140,7 @@ class PgQAPI (object):
         return None
 
     def msg_proc_start(self, message_id):
+        # TODO add consumer ip
         logging.debug('reached msg_proc_start')
         logging.debug('starting processing of message [%s]' % message_id)
         ds = self.get_msg(message_id)
@@ -151,9 +152,10 @@ class PgQAPI (object):
             logging.error('message [%s] is in bad status [%s]' % (str(message_id), msg_status) )
             return False
         self.exec_update('update queue_message set proc_start=now(), status=%s where id = %s', ('A', message_id) )
+        logging.debug('returning payload [%s]' % payload)
         return payload
 
-    def msg_proc_end(self, message_id):
+    def msg_proc_end(self, message_id, error_message=None, comment_text=None):
         logging.debug('reached msg_proc_end')
         logging.debug('ending processing of message [%s]' % message_id)
         ds = self.get_msg(message_id)
@@ -164,10 +166,10 @@ class PgQAPI (object):
         if msg_status != 'A':
             logging.error('message [%s] is in bad status [%s]' % (str(message_id), msg_status) )
             return False
-        self.exec_update('update queue_message set proc_end=now(), status=%s where id = %s', ('P', message_id) )
+        self.exec_update('update queue_message set proc_end=now(), status=%s, error_message=%s, comment_text=%s where id = %s', ('P', error_message, comment_text, message_id) )
         return payload
 
-    def msg_proc_fail(self, message_id, error_message):
+    def msg_proc_fail(self, message_id, error_message=None, comment_text=None):
         logging.debug('reached msg_proc_fail')
         logging.debug('failing processing of message [%s]' % message_id)
         ds = self.get_msg(message_id)
@@ -178,7 +180,21 @@ class PgQAPI (object):
         if msg_status != 'A':
             logging.error('message [%s] is in bad status [%s]' % (str(message_id), msg_status) )
             return False
-        self.exec_update('update queue_message set proc_end=now(), status=%s, error_message=%s where id = %s', ('F', message_id, error_message) )
+        self.exec_update('update queue_message set proc_end=now(), status=%s, error_message=%s, comment_text=%s where id = %s', ('F', error_message, comment_text, message_id) )
+        return payload
+
+    def msg_proc_end(self, message_id):
+        logging.debug('reached msg_proc_end')
+        logging.debug('ending processing of message [%s]' % message_id)
+        ds = self.get_msg(message_id)
+        if not ds:
+            logging.error('message [%s] does not exist' % message_id)
+            return None
+        (msg_status, payload) = ds
+        if msg_status != 'A':
+            logging.error('message [%s] is in bad status [%s]' % (str(message_id), msg_status) )
+            return False
+        self.exec_update('update queue_message set proc_end=now(), status=%s where id = %s', ('P', message_id) )
         return payload
 
     def new_msg_from_queue(self, queue_code):
@@ -194,6 +210,9 @@ class PgQAPI (object):
             return None
         msg_id = ds[0][0]
         logging.debug('found new message id [%s], [%s] new messages in queue' % (msg_id, ds[0][1]) )
+        logging.debug('requesting payload from msg_proc_start')
         payload = self.msg_proc_start(msg_id)
-        return payload, msg_id
+        logging.debug('msg_proc_start returned [%s]' % payload)
+        logging.debug('returning payload [%s] with msg_id [%s]' % (payload, msg_id) )
+        return payload,msg_id
         

{oc_cdtapi-3.17.1.dist-info → oc_cdtapi-3.18.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oc-cdtapi
-Version: 3.17.1
+Version: 3.18.2
 Summary: Custom Development python API libraries
 License: Apache2.0
 Requires-Python: >=3.6

{oc_cdtapi-3.17.1.dist-info → oc_cdtapi-3.18.2.dist-info}/RECORD

@@ -6,13 +6,13 @@ oc_cdtapi/DmsGetverAPI.py,sha256=ZPU4HlF59fngKu5mSFhtss3rlBuduffDOSm_y3XWrxk,155
 oc_cdtapi/ForemanAPI.py,sha256=9r1MSOsubiSxM1sdzF2MHD7IcSwX9Y4UDJknHqQK07g,44255
 oc_cdtapi/JenkinsAPI.py,sha256=lZ8pe3a4eb_6h53JE7QLuzOSlu7Sqatc9PQwWhio9Vg,15748
 oc_cdtapi/NexusAPI.py,sha256=uU12GtHvKlWorFaPAnFcQ5AGEc94MZ5SdmfM2Pw3F7A,26122
-oc_cdtapi/PgQAPI.py,sha256=rQxO6N_e1l_ACaAgE0MA1WLHlWypdw6igy942ly6uRo,8151
+oc_cdtapi/PgQAPI.py,sha256=OUdUwaoa8-Yo08vF6qo94Ml42nRT8RtzbonRPRltWSE,9245
 oc_cdtapi/RundeckAPI.py,sha256=O3LmcFaHSz8UqeUyIHTTEMJncDD191Utd-iZaeJay2s,24243
 oc_cdtapi/TestServer.py,sha256=HV97UWg2IK4gOYAp9yaMdwFUWsw9v66MxyZdI3qQctA,2715
 oc_cdtapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oc_cdtapi-3.17.1.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
-oc_cdtapi-3.17.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-oc_cdtapi-3.17.1.dist-info/METADATA,sha256=_ro_PynB_h1s9PQiutS6kmaKQU5UY5OA3uWSsJnLa-c,484
-oc_cdtapi-3.17.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-oc_cdtapi-3.17.1.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
-oc_cdtapi-3.17.1.dist-info/RECORD,,
+oc_cdtapi-3.18.2.data/scripts/nexus.py,sha256=4teqZ_KtCSrwHDJVgA7lkreteod4Xt5XJFZNbwb7E6E,6858
+oc_cdtapi-3.18.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+oc_cdtapi-3.18.2.dist-info/METADATA,sha256=EkK4ZyYgF-GWWFx-59YTRgFiinOB_CDC318XSd288aw,484
+oc_cdtapi-3.18.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+oc_cdtapi-3.18.2.dist-info/top_level.txt,sha256=d4-5-D-0CSeSXYuLCP7-nIFCpjkfmJr-Y_muzds8iVU,10
+oc_cdtapi-3.18.2.dist-info/RECORD,,

{oc_cdtapi-3.17.1.dist-info → oc_cdtapi-3.18.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any