Changeset 6017 for n4d-epoptes-client/trunk/fuentes/install-files/usr/share/n4d/python-plugins/EpoptesClient.py

Timestamp:

Oct 11, 2017, 6:31:07 PM (3 years ago)

Author:

hectorgh

Message:

epoptes-client -c is blocking startups

File:

• n4d-epoptes-client/trunk/fuentes/install-files/usr/share/n4d/python-plugins/EpoptesClient.py (modified) (2 diffs)

n4d-epoptes-client/trunk/fuentes/install-files/usr/share/n4d/python-plugins/EpoptesClient.py

@@ -2 +2 @@
 import os
 import lliurex.net
+import threading
 
 class EpoptesClient:
@@ -9 +10 @@
                 if options["controlled"]:
                         if options["boot"]:
-                                
-                                if os.system("host server > /dev/null")==0:
-                                        p=subprocess.Popen(["epoptes-client -c"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-                                        p.communicate()
-                        
-                                devices=lliurex.net.get_devices_info()
-                                
-                                for dev in devices:
-                                        os.system("ethtool -s %s wol g"%dev["name"])
+                                self.grab_epoptes_certificate_thread()
+                                self.disable_wol_thread()
                                         
         #def startup
         
+        def grab_epoptes_certificate_thread(self):
+                
+                t=threading.Thread(target=self._grab_epoptes_certificate)
+                t.daemon=True
+                t.start()
+                
+        #def epoptes_daemon
+        
+        def _grab_epoptes_certificate(self):
+                
+                if os.system("host server > /dev/null")==0:
+                        
+                        execute=False
+                        p=subprocess.Popen(["ps aux | grep 'epoptes -c' | wc -l"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                        output=p.communicate()
+                        try:
+                                t=int(output[0].strip("\n"))
+                                if t>1:
+                                        execute=True
+                        except:
+                                execute=False
+                                
+                        
+                        if execute:
+                                p=subprocess.Popen(["epoptes-client -c"],shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+                                p.communicate()
+                
+        #def _grab_epoptes_certificate
+        
+        def disable_wol_thread(self):
+                
+                t=threading.Thread(target=self._disable_wol)
+                t.daemon=True
+                t.start()
+                
+        #def disable_wol_thread
+        
+        
+        def  _disable_wol(self):
+                
+                devices=lliurex.net.get_devices_info()
+                for dev in devices:
+                        os.system("ethtool -s %s wol g"%dev["name"])
+                
+        #def _disable_wol
+        
 #class EpoptesClient