Merge "Append to run_list, ignore_list during task exec"

openstack-archive · Jun 30, 2016 · 31638e2 · 31638e2
2 parents 552a3c9 + d35fbb5
commit 31638e2
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/poppy/manager/default/background_job.py b/poppy/manager/default/background_job.py
@@ -54,7 +54,6 @@ def post_job(self, job_type, kwargs):
                     consume=True
                 )
 
-                run_list += queue_data
                 for cert_dict in queue_data:
                     try:
                         cert_dict = json.loads(cert_dict)
@@ -77,11 +76,15 @@ def post_job(self, job_type, kwargs):
                             check_cert_status_and_update_flow,
                             **t_kwargs
                         )
+                        run_list.append(cert_dict)
                     except Exception as e:
-                        akamai_driver.san_mapping_queue.enqueue_san_mapping(
-                            json.dumps(cert_dict)
-                        )
-                        run_list.remove(cert_dict)
+                        try:
+                            akamai_driver.san_mapping_queue.\
+                                enqueue_san_mapping(json.dumps(cert_dict))
+                        except Exception as e:
+                            akamai_driver.san_mapping_queue.\
+                                enqueue_san_mapping(cert_dict)
+
                         cert_dict['error_message'] = str(e.message)
                         ignore_list.append(cert_dict)
                         LOG.exception(e)
@@ -95,7 +98,6 @@ def post_job(self, job_type, kwargs):
 
             cname_host_info_list = []
 
-            run_list += queue_data
             for cert_dict in queue_data:
                 try:
                     cert_dict = json.loads(cert_dict)
@@ -137,8 +139,8 @@ def post_job(self, job_type, kwargs):
                         ),
                         "cnameType": "EDGE_HOSTNAME"
                     })
+                    run_list.append(cert_dict)
                 except Exception as e:
-                    run_list.remove(cert_dict)
                     cert_dict['error_message'] = str(e.message)
                     ignore_list.append(cert_dict)
                     LOG.exception(e)