* join timeout of elasticbu script in case of hanging inotify thread …

…when monitored directory is deleted

* os._exit used to finally exit elasticbu process
* fixed waiting for elastic process (wrong variable name was used)

python/aUtils.py

@@ -60,6 +60,18 @@ def register_inotify_path(self,path,mask):
     def start_inotify(self):
         self.inotifyWrapper.start()
 
+    def stop_inotifyTimeout(self,timeout):
+        self.logger.info("MonitorRanger: Stop inotify wrapper")
+        self.inotifyWrapper.stop()
+        self.logger.info("MonitorRanger: Join inotify wrapper")
+        self.inotifyWrapper.join(timeout)
+        if self.inotifyWrapper.isAlive():
+            self.logger.info("MonitorRanger: Inotify wrapper join timeout ("+str(timeout)+")")
+            return False
+        else:
+            self.logger.info("MonitorRanger: Inotify wrapper returned")
+            return True
+
     def stop_inotify(self):
         self.logger.info("MonitorRanger: Stop inotify wrapper")
         self.inotifyWrapper.stop()

python/elasticbu.py

@@ -644,9 +644,9 @@ def checkBoxes(self,dir):
 
     def waitForAnelasticMon(self):
         try:
-            self.parent.elastic_process.wait()
+            self.parent.elastic_monitor.wait()
         except:pass
-        self.parent.elastic_process = None
+        self.parent.elastic_monitor = None
 
     def run(self):
 
@@ -799,8 +799,8 @@ def stop(self):
 
     logging.info("Closing notifier")
     if mr is not None:
-      mr.stop_inotify()
+      mr.stop_inotifyTimeout(1)
 
     logging.info("Quit")
-    sys.exit(0)
+    os._exit(0)
 

scripts/hltdrpm.sh

@@ -196,7 +196,7 @@ cd $TOPDIR
 cat > hltd.spec <<EOF
 Name: hltd
 Version: 1.6.3
-Release: 0
+Release: 1
 Summary: hlt daemon
 License: gpl
 Group: DAQ