Changeset 3456 for lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics

Timestamp:

Jan 31, 2017, 1:25:21 PM (4 years ago)

Author:

mabarracus

Message:

Fix priority of server over local acknowledge

File:

• lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics (modified) (2 diffs)

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

@@ -94 +94 @@
             return c.get_variable("","VariablesManager","STATS_ENABLED")
         except:
-            return '0'
+            return 'None'
 #END def check_server_acknowledge()
 
@@ -109 +109 @@
 def allow_send():
     answer = check_server_acknowledge()
-    if answer != '1':
-        answer = check_local_acknowledge()
-        try:
-            if answer == "yes":
-                debug("allow_send stats by check local acknowledge")
-                return True
-            else:
-                debug("deny allow_send stats by check server & local acknowledge")
-                return False
-        except Exception as e:
-            debug("deny allow_send stats by exception check server & local acknowledge")
-            return False
-    else:
+    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":
+        debug("allow_send stats by check local acknowledge")
+        return True
+    if answer == 'no':
+        debug("deny allow_send by check local acknowledge")
+        return False
+
+    debug("deny allow_send stats by exception check server & local acknowledge")
+    return False
+
 #END def allow_send()