Changeset 4866

Timestamp:

May 23, 2017, 10:19:41 AM (22 months ago)

Author:

mabarracus

Message:

Fix race condition that stops sending messages when time changes
Optimize subprocessing calls
Better flavour detection

Location:

lliurex-statistics/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-statistics.install/usr/sbin/analytics (modified) (8 diffs)

lliurex-statistics/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-statistics (0.4-7) xenial; urgency=medium
+
+  * Fix race condition that stops sending messages when time changes
+  * Optimize subprocessing calls
+  * Better flavour detection
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Tue, 23 May 2017 10:17:58 +0200
+
 lliurex-statistics (0.4-6) xenial; urgency=medium
 

lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics

@@ -17 +17 @@
 import lockfile
 import xmlrpclib
+import time
 
 ######### END CONFIG ###########
@@ -46 +47 @@
 #
 def sig_handler(sig,frame):
-    global t,LIST
+    global t,LIST,RUNNER
     debug("Aborting...")
+    RUNNER=0
     try:
         # Cancel threads
@@ -108 +110 @@
 
 def allow_send():
-    answer = check_server_acknowledge()
-    if answer == '1':
-        debug("allow_send stats by check server acknowledge")
-        return True
-    if answer == '0':
-        debug("deny allow_send stats by check server acknowledge")
-        return False
-    
+    global SABOR
+
+    if SABOR.lower() != 'server':
+        answer = check_server_acknowledge()
+        if answer == '1':
+            debug("allow_send stats by check server acknowledge")
+            return True
+        if answer == '0':
+            debug("deny allow_send stats by check server acknowledge")
+            return False
+
     answer = check_local_acknowledge()
     if answer == "yes":
@@ -172 +177 @@
         global TIMEOUT
         global BDTIMEOUT
-
-        # Flush in-memory data to file db when expires timeout
-        if ctimeout > TIMEOUT:
+        global RUNNER
+        
+        while RUNNER == 1:
+            # Flush in-memory data to file db when expires timeout
+            if ctimeout > TIMEOUT:
                 update_db()
                 ctimeout=0
-        else:
+            else:
                 ctimeout+=1
 
-        # Call send-data to server when expires dbtimeout
-        if btimeout > BDTIMEOUT:
+            # Call send-data to server when expires dbtimeout
+            if btimeout > BDTIMEOUT:
                 clean_and_send();
                 btimeout=0
-        else:
+            else:
                 btimeout+=1
-        debug('.',2)
-
-        # Reload 1 sec timeout
-        t=threading.Timer(1.0,runner)
-#        De-comment to allow stop threads inmediately
-#        t.daemon = True
-        t.start()
+            debug('.',2)
+            time.sleep(1.0)
+            # Reload 1 sec timeout
+            #t=threading.Timer(1.0,runner)
+#           De-comment to allow stop threads inmediately
+#           t.daemon = True
+            #t.start()
 #END def runner():
 
@@ -263 +270 @@
 #
 def send_data():
+    global SABOR
+    global RELEASE
+
     # Calculates mac address
     f = open('/sys/class/net/eth0/address','r');
@@ -280 +290 @@
     except:
         return;
+    
     # Get version and flavour
-    p=subprocess.Popen(['lliurex-version','-n'],stdout=subprocess.PIPE)
-    out,err=p.communicate()
-    version=out.strip();
-
-    p=subprocess.Popen(['lliurex-version','-v'],stdout=subprocess.PIPE)
-    out,err=p.communicate()
-    sabor=out.strip();
+    #p=subprocess.Popen(['lliurex-version','-n'],stdout=subprocess.PIPE)
+    #out,err=p.communicate()
+    #version=out.strip();
+    version=RELEASE
+
+    #p=subprocess.Popen(['lliurex-version','-f'],stdout=subprocess.PIPE)
+    #out,err=p.communicate()
+    #sabor=out.strip();
+    sabor=SABOR
 
     # Send json encoded data to server
@@ -474 +487 @@
 ctimeout=0
 btimeout=0
+RUNNER=1
 
 # Get configuration parameters
@@ -507 +521 @@
 
 debug("filename="+filename+' next='+next_filename)
+
+p=subprocess.Popen(['lliurex-version','-n'],stdout=subprocess.PIPE)
+RELEASE,err=p.communicate()
+RELEASE=RELEASE.strip()
+if RELEASE[0:2] == '15':
+    VERSION_GETTER='lliurex-detect'
+else:
+    VERSION_GETTER='lliurex-version'
+
+
+p=subprocess.Popen([VERSION_GETTER,'-f'],stdout=subprocess.PIPE)
+SABOR,err=p.communicate()
+SABOR=SABOR.strip()
+
+debug('Starting on '+SABOR+' '+RELEASE)
 try:
      px= subprocess.Popen(["bash","-c","source /etc/profile && echo $http_proxy"],stdout=subprocess.PIPE)
      proxy=px.stdout.readline().strip()
-     debug('Detected proxy: '+str(proxy))
+     if str(proxy) != '':
+        debug('Detected proxy: '+str(proxy))
 except Exception as e:
      debug('Error getting proxy '+str(e))