Prechádzať zdrojové kódy

Fix make_allfunc() logic broken by bad merge

Mike Naberezny 10 rokov pred
rodič
commit
704cd4eb9b
1 zmenil súbory, kde vykonal 9 pridanie a 9 odobranie
  1. 9 9
      supervisor/rpcinterface.py

+ 9 - 9
supervisor/rpcinterface.py

@@ -849,16 +849,16 @@ def make_allfunc(processes, predicate, func, **extra_kwargs):
                      'group':group.config.name,
                      'status':e.code,
                      'description':e.text})
-                value = None
-
-            if value is not NOT_DONE_YET:
-                results.append(
-                    {'name':process.config.name,
-                     'group':group.config.name,
-                     'status':Faults.SUCCESS,
-                     'description':'OK'}
-                    )
                 callbacks.remove(struct)
+            else:
+                if value is not NOT_DONE_YET:
+                    results.append(
+                        {'name':process.config.name,
+                         'group':group.config.name,
+                         'status':Faults.SUCCESS,
+                         'description':'OK'}
+                        )
+                    callbacks.remove(struct)
 
         if callbacks:
             return NOT_DONE_YET