freifunk-franken
/
monitoring
mirror of https://github.com/FreifunkFranken/fff-monitoring.git
3
0
Fork 0
Code Issues Releases Wiki Activity

calcglobalstats/deletestats: Limit decimal places for durations 

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2017-12-08 13:12:21 +01:00
parent 133078be83
commit faec559e1b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ffmap/routertools.py
View File

@ -270,8 +270,8 @@ def delete_old_stats(mysql):
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
""",(threshold,))
mysql.commit()
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete stats: %s seconds" % (time.time() - start_time))
print("--- Delete stats: %s seconds ---" % (time.time() - start_time))
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete stats: %.3f seconds" % (time.time() - start_time))
print("--- Delete stats: %.3f seconds ---" % (time.time() - start_time))
start_time = time.time()
mysql.execute("""
@ -280,8 +280,8 @@ def delete_old_stats(mysql):
WHERE s.time < %s AND (r.status = 'online' OR r.status IS NULL)
""",(threshold,))
mysql.commit()
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete neighbor-stats: %s seconds" % (time.time() - start_time))
print("--- Delete neighbor-stats: %s seconds ---" % (time.time() - start_time))
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete neighbor-stats: %.3f seconds" % (time.time() - start_time))
print("--- Delete neighbor-stats: %.3f seconds ---" % (time.time() - start_time))
start_time = time.time()
mysql.execute("""
@ -301,8 +301,8 @@ def delete_old_stats(mysql):
mysql.commit()
time.sleep(10)
minustime += 10
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete netif stats: %s seconds" % (time.time() - start_time - minustime))
print("--- Delete netif stats: %s seconds ---" % (time.time() - start_time - minustime))
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete netif stats: %.3f seconds" % (time.time() - start_time - minustime))
print("--- Delete netif stats: %.3f seconds ---" % (time.time() - start_time - minustime))
start_time = time.time()
events = mysql.fetchall("""
@ -320,8 +320,8 @@ def delete_old_stats(mysql):
LIMIT %s
""",(e["router"],delnum,))
mysql.commit()
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete events: %s seconds" % (time.time() - start_time))
print("--- Delete events: %s seconds ---" % (time.time() - start_time))
writelog(CONFIG["debug_dir"] + "/deletetime.txt", "Delete events: %.3f seconds" % (time.time() - start_time))
print("--- Delete events: %.3f seconds ---" % (time.time() - start_time))
def events_append(mysql,router_id,event,comment):
mysql.execute("""

2
scripts/calcglobalstats.py
View File

@ -24,4 +24,4 @@ record_hood_stats(mysql)
update_mapnik_csv(mysql)
mysql.close()
print("--- %s seconds ---" % (time.time() - start_time))
print("--- %.3f seconds ---" % (time.time() - start_time))

2
scripts/deletestats.py
View File

@ -16,4 +16,4 @@ mysql = FreifunkMySQL()
delete_old_stats(mysql)
mysql.close()
print("--- Total duration: %s seconds ---" % (time.time() - start_time))
print("--- Total duration: %.3f seconds ---" % (time.time() - start_time))