base: Check for conditions before checking for not_observed (Fixes: #208

)
mami-project · Jan 15, 2018 · bfba9af · bfba9af
1 parent cab3d08
commit bfba9af
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pathspider/base.py b/pathspider/base.py
@@ -386,11 +386,12 @@ def merge(self, flow, res):
                 if not flow['observed']:
                     job['missed_flows'] = job['missed_flows'] + 1
             job['conditions'] = self.combine_flows(flows)
-            if "pathspider.not_observed" in job['conditions']:
-                self.__logger.debug("At least one flow was not observed and so conditions could not be fully generated (if at all)")
-            if job['missed_flows'] > 0:
-                job['conditions'].append("pathspider.missed_flows:" + str(job['missed_flows']))
-            if job['conditions'] is None:
+            if job['conditions'] is not None:
+                if "pathspider.not_observed" in job['conditions']:
+                    self.__logger.debug("At least one flow was not observed and so conditions could not be fully generated (if at all)")
+                if job['missed_flows'] > 0:
+                    job['conditions'].append("pathspider.missed_flows:" + str(job['missed_flows']))
+            else:
                 job.pop('conditions')
             self.outqueue.put(job)