Changeset 6933 for lliurex-analytics-server
- Timestamp:
- Feb 28, 2018, 12:45:45 PM (3 years ago)
- Location:
- lliurex-analytics-server/trunk/fuentes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-analytics-server/trunk/fuentes/debian/changelog
r6926 r6933 1 lliurex-analytics-server (0.2.5) xenial; urgency=medium 2 3 * Fix bugs 4 5 -- M.Angel Juan <m.angel.juan@gmail.com> Wed, 28 Feb 2018 12:36:52 +0100 6 1 7 lliurex-analytics-server (0.2.4.1) xenial; urgency=medium 2 8 -
lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/lib/analytics-server/analytics/db.php
r6889 r6933 6 6 private $data_file; 7 7 private $data; 8 private $cache_timeout= 60*60;8 private $cache_timeout=3600; 9 9 10 10 function Cache(){ … … 274 274 if ($result){ 275 275 $tmp=[]; 276 foreach ($result->fetch_all(MYSQLI_ASSOC) as $value){277 $tmp[$ value['name']]=$value['value'];276 while ($row=$result->fetch_array(MYSQLI_ASSOC)){ 277 $tmp[$row['name']]=$row['value']; 278 278 } 279 279 return json_encode($tmp); … … 749 749 $sql2 = "select `name`,`status` from `PackagesWhitelist`"; 750 750 $result=$this->dbconn->query($sql); 751 $all_items= false;751 $all_items=array(); 752 752 if ($result){ 753 $all_items=$result->fetch_all(MYSQLI_ASSOC); 754 } 755 $whitelist=false; 753 while($row=$result->fetch_array(MYSQLI_ASSOC)){ 754 $all_items[]=$row; 755 } 756 } 757 $whitelist=array(); 756 758 $result = $this->dbconn->query($sql2); 757 759 if ($result){ 758 $whitelist = $result->fetch_all(MYSQLI_ASSOC); 759 } 760 if ($all_items === false or $whitelist === false){ 760 while($row=$result->fetch_array(MYSQLI_ASSOC)){ 761 $whitelist[] = $row; 762 } 763 } 764 if (count($all_items) == 0){ 761 765 return false; 762 766 } -
lliurex-analytics-server/trunk/fuentes/lliurex-analytics-server/usr/sbin/analyticsd
r6926 r6933 955 955 956 956 if __name__ == "__main__": 957 exit = False957 exit = 0 958 958 keyword='analyticsd' 959 interpreter='python3' 959 960 for proc in psutil.process_iter(): 960 for argument in proc.cmdline(): 961 #print('{} {} {}'.format(proc.cmdline(),keyword,argument[-len(keyword):])) 961 a=False 962 b=False 963 for argument in proc.cmdline: 964 #print('{} {} {}'.format(proc.cmdline,keyword,argument[-len(keyword):])) 965 if interpreter in argument[-len(interpreter):]: 966 a = True 962 967 if keyword in argument[-len(keyword):]: 963 exit = True 964 break 965 if exit: 966 break 967 if exit: 968 printea("Another daemon running... exitting now!") 968 b = True 969 if a and b: 970 exit = exit +1 971 if exit > 1: 972 printea('Another daemon is running','error') 969 973 sys.exit(1) 970 lck = '/var/run/analyticsd.lock' 974 975 lck = '/var/run/analyticsd' 971 976 if DAEMON: 972 if os.path.isfile(lck ):977 if os.path.isfile(lck+'.lock'): 973 978 printea('Lockfile {} detected, unable to start'.format(lck),'error') 974 979 sys.exit(1)
Note: See TracChangeset
for help on using the changeset viewer.