Merge pull request #428 from PanDAWMS/095-code-improvement

DF/data4es(-nested)/095: improve try/except logic.
PanDAWMS · Oct 22, 2020 · 9fb267e · 9fb267e
2 parents 6207fa8 + 0a9afbd
commit 9fb267e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Utils/Dataflow/data4es-nested/095_datasetInfoAMI/amiDatasets.py b/Utils/Dataflow/data4es-nested/095_datasetInfoAMI/amiDatasets.py
@@ -163,10 +163,11 @@ def process(stage, message):
             except Exception:
                 stage.output_error("Failed to process dataset '%s'"
                                    % ds['name'], sys.exc_info())
-            # Do not put this into try/except above:
-            #   any exception produced by it indicates a problem
-            #   with the stage code that demands a full stop.
-            change_key_names(ds)
+            else:
+                # Do not put this into try/except above:
+                #   any exception produced by it indicates a problem
+                #   with the stage code that demands a full stop.
+                change_key_names(ds)
     stage.output(pyDKB.dataflow.communication.messages.JSONMessage(data))
 
     return True

diff --git a/Utils/Dataflow/data4es/095_datasetInfoAMI/amiDatasets.py b/Utils/Dataflow/data4es/095_datasetInfoAMI/amiDatasets.py
@@ -170,9 +170,11 @@ def process(stage, message):
         except Exception:
             stage.output_error("Failed to process dataset '%s'"
                                % data['datasetname'], sys.exc_info())
-        # Do not put this into try/except above - any exception produced by it
-        # indicates a problem with the stage code that demands a full stop.
-        change_key_names(data)
+        else:
+            # Do not put this into try/except above - any exception produced
+            # by it indicates a problem with the stage code that demands
+            # a full stop.
+            change_key_names(data)
     stage.output(pyDKB.dataflow.communication.messages.JSONMessage(data))
 
     return True