CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Moved logging into a function

pull/108/head
Mokaddem 2017-02-15 10:57:41 +01:00
parent 0fce3f5d65
commit b84194542d
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
bin/ModulesInformationV2.py
View File

@ -24,7 +24,7 @@ command_search_pid = "ps a -o pid,cmd | grep {}"
command_search_name = "ps a -o pid,cmd | grep {}" command_search_name = "ps a -o pid,cmd | grep {}"
command_restart_module = "screen -S \"Script\" -X screen -t \"{}\" bash -c \"./{}.py; read x\"" command_restart_module = "screen -S \"Script\" -X screen -t \"{}\" bash -c \"./{}.py; read x\""
printarrayGlob = [None]*14 printarrayLog = [None]*14
lastTimeKillCommand = {} lastTimeKillCommand = {}
# Used to pass information through scenes # Used to pass information through scenes
@ -505,8 +505,7 @@ def clearRedisModuleInfo():
for k in server.keys("MODULE_*"): for k in server.keys("MODULE_*"):
server.delete(k) server.delete(k)
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], "*", "-", "Cleared redis module info"], 0)) log(([str(inst_time).split(' ')[1], "*", "-", "Cleared redis module info"], 0))
printarrayGlob.pop()
def cleanRedis(): def cleanRedis():
for k in server.keys("MODULE_TYPE_*"): for k in server.keys("MODULE_TYPE_*"):
@ -524,15 +523,12 @@ def cleanRedis():
#print flag_pid_valid, 'cleaning', pid, 'in', k #print flag_pid_valid, 'cleaning', pid, 'in', k
server.srem(k, pid) server.srem(k, pid)
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], moduleName, pid, "Cleared invalid pid in " + k], 0)) log(([str(inst_time).split(' ')[1], moduleName, pid, "Cleared invalid pid in " + k], 0))
printarrayGlob.pop()
#Error due to resize, interrupted sys call #Error due to resize, interrupted sys call
except IOError as e: except IOError as e:
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], " - ", " - ", "Cleaning fail due to resize."], 0)) log(([str(inst_time).split(' ')[1], " - ", " - ", "Cleaning fail due to resize."], 0))
printarrayGlob.pop()
pass
def restart_module(module, count=1): def restart_module(module, count=1):
@ -540,9 +536,7 @@ def restart_module(module, count=1):
p2 = Popen([command_restart_module.format(module, module)], stdin=PIPE, stdout=PIPE, bufsize=1, shell=True) p2 = Popen([command_restart_module.format(module, module)], stdin=PIPE, stdout=PIPE, bufsize=1, shell=True)
time.sleep(0.2) time.sleep(0.2)
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, "?", "Restarted " + str(count) + "x"], 0)) log(([str(inst_time).split(' ')[1], module, "?", "Restarted " + str(count) + "x"], 0))
printarrayGlob.pop()
def kill_module(module, pid): def kill_module(module, pid):
@ -551,8 +545,7 @@ def kill_module(module, pid):
if pid is None: if pid is None:
#print 'pid was None' #print 'pid was None'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "PID was None"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "PID was None"], 0))
printarrayGlob.pop()
pid = getPid(module) pid = getPid(module)
else: #Verify that the pid is at least in redis else: #Verify that the pid is at least in redis
if server.exists("MODULE_"+module+"_"+str(pid)) == 0: if server.exists("MODULE_"+module+"_"+str(pid)) == 0:
@ -566,42 +559,36 @@ def kill_module(module, pid):
except Exception as e: except Exception as e:
#print pid, 'already killed' #print pid, 'already killed'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Already killed"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Already killed"], 0))
printarrayGlob.pop()
return return
time.sleep(0.2) time.sleep(0.2)
if not p.is_running(): if not p.is_running():
#print module, 'has been killed' #print module, 'has been killed'
#print 'restarting', module, '...' #print 'restarting', module, '...'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Killed"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Killed"], 0))
printarrayGlob.pop()
#restart_module(module) #restart_module(module)
else: else:
#print 'killing failed, retrying...' #print 'killing failed, retrying...'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Killing #1 failed."], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Killing #1 failed."], 0))
printarrayGlob.pop()
p.terminate() p.terminate()
if not p.is_running(): if not p.is_running():
#print module, 'has been killed' #print module, 'has been killed'
#print 'restarting', module, '...' #print 'restarting', module, '...'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Killed"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Killed"], 0))
printarrayGlob.pop()
#restart_module(module) #restart_module(module)
else: else:
#print 'killing failed!' #print 'killing failed!'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Killing failed!"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Killing failed!"], 0))
printarrayGlob.pop()
else: else:
#print 'Module does not exist' #print 'Module does not exist'
inst_time = datetime.datetime.fromtimestamp(int(time.time())) inst_time = datetime.datetime.fromtimestamp(int(time.time()))
printarrayGlob.insert(0, ([str(inst_time).split(' ')[1], module, pid, "Killing failed, module not found"], 0)) log(([str(inst_time).split(' ')[1], module, pid, "Killing failed, module not found"], 0))
printarrayGlob.pop()
cleanRedis() cleanRedis()
@ -640,7 +627,7 @@ def fetchQueueData():
if int(card) > 0: if int(card) > 0:
# Queue need to be killed # Queue need to be killed
if int((datetime.datetime.now() - startTime_readable).total_seconds()) > args.treshold: if int((datetime.datetime.now() - startTime_readable).total_seconds()) > args.treshold:
#log = open(log_filename, 'a') log(([time.time(), queue, "-", "ST:"+timestamp+" PT:"+time.time()-timestamp], 0), True)
#log.write(json.dumps([queue, card, str(startTime_readable), str(processed_time_readable), path]) + "\n") #log.write(json.dumps([queue, card, str(startTime_readable), str(processed_time_readable), path]) + "\n")
try: try:
last_kill_try = time.time() - lastTimeKillCommand[moduleNum] last_kill_try = time.time() - lastTimeKillCommand[moduleNum]
@ -730,6 +717,13 @@ def format_string(tab, padding_row):
printstring.append( (text, the_pid) ) printstring.append( (text, the_pid) )
return printstring return printstring
def log(data, write_on_disk=False):
printarrayLog.insert(0, data)
printarrayLog.pop()
if write_on_disk:
with open(log_filename, 'a') as log:
log.write(json.dumps(data[0]) + "\n")
''' '''
END MANAGE END MANAGE
''' '''
@ -760,7 +754,7 @@ def demo(screen):
cleanRedis() cleanRedis()
for key, val in fetchQueueData().iteritems(): #fetch data and put it into the tables for key, val in fetchQueueData().iteritems(): #fetch data and put it into the tables
TABLES[key] = val TABLES[key] = val
TABLES["logs"] = format_string(printarrayGlob, TABLES_PADDING["logs"]) TABLES["logs"] = format_string(printarrayLog, TABLES_PADDING["logs"])
#refresh dashboad only if the scene is active (no value selected) #refresh dashboad only if the scene is active (no value selected)
if current_selected_value == 0: if current_selected_value == 0: