Changeset 6933 for lliurex-analytics-server

Timestamp:

Feb 28, 2018, 12:45:45 PM (3 years ago)

Author:

mabarracus

Message:

Fix bugs

Location:

lliurex-analytics-server/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• lliurex-analytics-server/usr/lib/analytics-server/analytics/db.php (modified) (3 diffs)
• lliurex-analytics-server/usr/sbin/analyticsd (modified) (1 diff)

lliurex-analytics-server/trunk/fuentes/debian/changelog

@@ +1 @@
+lliurex-analytics-server (0.2.5) xenial; urgency=medium
+
+  * Fix bugs
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 28 Feb 2018 12:36:52 +0100
+
 lliurex-analytics-server (0.2.4.1) xenial; urgency=medium
 

lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/lib/analytics-server/analytics/db.php

@@ -6 +6 @@
     private $data_file;
     private $data;
-    private $cache_timeout=60*60;
+    private $cache_timeout=3600;
 
     function Cache(){
@@ -274 +274 @@
             if ($result){
                 $tmp=[];
-                foreach ($result->fetch_all(MYSQLI_ASSOC) as $value){
-                    $tmp[$value['name']]=$value['value'];
+                while ($row=$result->fetch_array(MYSQLI_ASSOC)){
+                    $tmp[$row['name']]=$row['value'];
                 }
                 return json_encode($tmp);
@@ -749 +749 @@
         $sql2 = "select `name`,`status` from `PackagesWhitelist`";
         $result=$this->dbconn->query($sql);
-        $all_items=false;
+        $all_items=array();
         if ($result){
-            $all_items=$result->fetch_all(MYSQLI_ASSOC);
-        }
-        $whitelist=false;
+            while($row=$result->fetch_array(MYSQLI_ASSOC)){
+                $all_items[]=$row;
+            }
+        }
+        $whitelist=array();
         $result = $this->dbconn->query($sql2);
         if ($result){
-            $whitelist = $result->fetch_all(MYSQLI_ASSOC);
-        }
-        if ($all_items === false or $whitelist === false){
+            while($row=$result->fetch_array(MYSQLI_ASSOC)){
+                $whitelist[] = $row;
+            }
+        }
+        if (count($all_items) == 0){
             return false;
         }

lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/sbin/analyticsd

@@ -955 +955 @@
 
 if __name__ == "__main__":
-    exit = False
+    exit = 0
     keyword='analyticsd'
+    interpreter='python3'
     for proc in psutil.process_iter():
-        for argument in proc.cmdline():
-            #print('{} {} {}'.format(proc.cmdline(),keyword,argument[-len(keyword):]))
+        a=False
+        b=False
+        for argument in proc.cmdline:
+            #print('{} {} {}'.format(proc.cmdline,keyword,argument[-len(keyword):]))
+            if interpreter in argument[-len(interpreter):]:
+                a = True
             if keyword in argument[-len(keyword):]:
-                exit = True
-                break
-        if exit:
-            break
-    if exit:
-        printea("Another daemon running... exitting now!")
+                b = True
+            if a and b:
+                exit = exit +1
+    if exit > 1:
+        printea('Another daemon is running','error')
         sys.exit(1)
-    lck = '/var/run/analyticsd.lock'
+
+    lck = '/var/run/analyticsd'
     if DAEMON:
-        if os.path.isfile(lck):
+        if os.path.isfile(lck+'.lock'):
             printea('Lockfile {} detected, unable to start'.format(lck),'error')
             sys.exit(1)