Changeset 3823 for lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

Timestamp:

Mar 7, 2017, 12:40:10 PM (3 years ago)

Author:

Juanma

Message:

Fixed is_running function

File:

• lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py (modified) (2 diffs)

lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py

@@ -176 +176 @@
         #  - status true/false
         ###
-        def is_action_running(self,action=None):
+        def is_action_running(self,actionSearched=None):
                 status=False
-                if action:
+                lst_Actions=[]
+                if actionSearched:
+                        lst_Actions.append(actionSearched)
+                else:
+                        lst_Action=self.relatedActions.keys()
+
+                for action in lst_Actions:
                         if action in self.threadsRunning:
                                 if self.threadsRunning[action].is_alive():
                                         status=True
+                                        break
                                 else:
                                         if action in self.relatedActions.keys():
@@ -190 +197 @@
                                                                         break
 #                                       self._debug(action+" running: "+str(status))
-                else:
-                        if (threading.active_count()-1):
-                                status=True
-#                               self._debug("Running: "+str(threading.active_count()) + " threads")
+#               else:
+#                       for action in self.relatedActions.keys():
+#                               self._debug("Checking running status for action: "+str(action))
+#                               for relatedAction in self.relatedActions[action]:
+#                                               if relatedAction in self.threadsRunning.keys():
+#                                                       if self.threadsRunning[relatedAction].is_alive():
+#                                                               status=True
+#                                                               break
+#                               self._debug("Running:" +str(status))
                 return(status)
         #def is_action_running