Changeset 6926 for lliurex-analytics-server

Timestamp:

Feb 26, 2018, 6:25:43 PM (3 years ago)

Author:

mabarracus

Message:

Fix bugs

Location:

lliurex-analytics-server/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• debian/postinst (modified) (2 diffs)
• lliurex-analytics-server/usr/lib/analytics-server/clean.sql (added)
• lliurex-analytics-server/usr/sbin/analyticsd (modified) (1 diff)

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

@@ +1 @@
+lliurex-analytics-server (0.2.4.1) xenial; urgency=medium
+
+  * Fix bugs
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Mon, 26 Feb 2018 18:22:12 +0100
+
 lliurex-analytics-server (0.2.4) xenial; urgency=medium
 

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

@@ -19 +19 @@
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
+do_backup(){
+    USER=$1
+    PASS=$2
+    echo 'Doing backup into /etc/lliurex-analytics-server'
+    appdump="$(which mysqldump)"
+    if [ -z "$appdump" ]; then 
+        echo "Mysqldump not found"
+        return 0
+    fi
+    date="$(date +%s)"
+    mkdir -p /etc/lliurex-analytics-server
+    $($appdump $USER $PASS analytics | gzip -9 > /etc/lliurex-analytics-server/dump.$date ) || true
+}
 do_dialog(){
     input=$(dialog      \
@@ -163 +176 @@
 
 # UPDATE DB FROM OLDER VERSIONS
+    do_backup "$rootuser" "$rootpass"
+
     is_version_1=0
     is_version_1_4=0

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

@@ -955 +955 @@
 
 if __name__ == "__main__":
-    size=len([ p.name() for p in psutil.process_iter() if p.name() == 'analyticsd' ])
-    if size > 1:
+    exit = False
+    keyword='analyticsd'
+    for proc in psutil.process_iter():
+        for argument in proc.cmdline():
+            #print('{} {} {}'.format(proc.cmdline(),keyword,argument[-len(keyword):]))
+            if keyword in argument[-len(keyword):]:
+                exit = True
+                break
+        if exit:
+            break
+    if exit:
         printea("Another daemon running... exitting now!")
         sys.exit(1)