Changeset 2948 for lliurex-statistics/trunk/fuentes/lliurex-statistics.install

Timestamp:

Nov 29, 2016, 2:16:32 PM (4 years ago)

Author:

mabarracus

Message:

Add debconf, n4d-vars, dialog confirmation logic

Location:

lliurex-statistics/trunk/fuentes/lliurex-statistics.install

Files:

• etc/audit/rules.d (deleted)
• etc/xdg (added)
• etc/xdg/autostart (added)
• etc/xdg/autostart/lliurex-stats.desktop (added)
• usr/bin/confirmator (added)
• usr/sbin/analytics (modified) (4 diffs)

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

@@ -16 +16 @@
 import daemon
 import lockfile
+import xmlrpclib
 
 ######### END CONFIG ###########
@@ -75 +76 @@
         LIST.clear()
         # Check if permission flag is granted
-        #if allow_send(): # DEPRECATED: commented, acceptation not needed
-        # Send data to master server
-        send_data()
+        if allow_send():
+            # Send data to master server
+            send_data()
         # Get new temporary filename
         next_filename=get_filename(LOGPATH)
@@ -86 +87 @@
 #END def change_file():
 
-#DEPRECATED FUNCTION: acceptation not needed now 
-#def allow_send():
-#    try:
-#        if os.path.isfile('/var/tmp/stats/do_stats'):
-#            return True
-#        else:
-#            return False
-#    except Exception as e:
-#        return False
+def check_server_acknowledge():
+        c = xmlrpclib.ServerProxy("https://server:9779/")
+        return c.get_variable("","VariablesManager","STATS_ENABLED")
+#END def check_server_acknowledge()
+
+def check_local_acknowledge():
+        answer = None
+        if os.path.isfile('/etc/lliurex-analytics/status'):
+            fp = open('/etc/lliurex-analytics/status','r')
+            answer = fp.readline();
+            fp.close()
+        return answer.strip()
+
+#END check_local_acknowledge
+
+def allow_send():
+    answer = check_server_acknowledge()
+    if answer != '1':
+        answer = check_local_acknowledge()
+        try:
+            if answer == "yes":
+                return True
+            else:
+                return False
+        except Exception as e:
+            return False
+    else:
+        return True
+#END def allow_send()
+
 #
 # Sends data to server and clear all
@@ -104 +126 @@
         # clear in-memory list
         LIST.clear()
-#        if allow_send():  # DEPRECATED: commented, acceptation not needed
-        # Send data to master server
-        send_data()
+        if allow_send(): 
+            # Send data to master server
+            send_data()
         # Clear database file
         clear_db()