Merge pull request #95 from mokaddem/module_handling

Module handling

bin/ModuleInformation.py

@@ -25,9 +25,9 @@ import json
 from terminaltables import AsciiTable
 import textwrap
 from colorama import Fore, Back, Style, init
+import curses
 
 # CONFIG VARIABLES
-threshold_stucked_module = 60*10*1 #1 hour
 kill_retry_threshold = 60 #1m
 log_filename = "../logs/moduleInfo.log"
 command_search_pid = "ps a -o pid,cmd | grep {}"
@@ -39,6 +39,15 @@ printarrayGlob = [None]*14
 printarrayGlob.insert(0, ["Time", "Module", "PID", "Action"])
 lastTimeKillCommand = {}
 
+#Curses init
+#stdscr = curses.initscr()
+#curses.cbreak()
+#stdscr.keypad(1)
+
+# GLOBAL
+last_refresh = 0
+
+
 def getPid(module):
     p = Popen([command_search_pid.format(module+".py")], stdin=PIPE, stdout=PIPE, bufsize=1, shell=True)
     for line in p.stdout:
@@ -145,23 +154,33 @@ def get_color(time, idle):
         temp = time.split(':')
         time = int(temp[0])*3600 + int(temp[1])*60 + int(temp[2])
 
-        if time >= threshold_stucked_module:
+        if time >= args.treshold:
             if not idle:
                 return Back.RED + Style.BRIGHT
             else:
                 return Back.MAGENTA + Style.BRIGHT
-        elif time > threshold_stucked_module/2:
+        elif time > args.treshold/2:
             return Back.YELLOW + Style.BRIGHT
         else:
             return Back.GREEN + Style.BRIGHT
     else:
         return Style.RESET_ALL
 
+def waiting_refresh():
+    global last_refresh
+    if time.time() - last_refresh < args.refresh:
+        return False
+    else:
+        last_refresh = time.time()
+        return True
+
+    
 
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description='Show info concerning running modules and log suspected stucked modules. May be use to automatically kill and restart stucked one.')
     parser.add_argument('-r', '--refresh', type=int, required=False, default=1, help='Refresh rate')
+    parser.add_argument('-t', '--treshold', type=int, required=False, default=60*10*1, help='Refresh rate')
     parser.add_argument('-k', '--autokill', type=int, required=False, default=0, help='Enable auto kill option (1 for TRUE, anything else for FALSE)')
     parser.add_argument('-c', '--clear', type=int, required=False, default=0, help='Clear the current module information (Used to clear data from old launched modules)')
 
@@ -176,8 +195,6 @@ if __name__ == "__main__":
     cfg = ConfigParser.ConfigParser()
     cfg.read(configfile)
 
-    threshold_stucked_module = cfg.getint("Module_ModuleInformation", "threshold_stucked_module")
-
     # REDIS #
     server = redis.StrictRedis(
         host=cfg.get("Redis_Queues", "host"),
@@ -199,6 +216,12 @@ if __name__ == "__main__":
         cleanRedis()
 
         while True:
+            if waiting_refresh():
+
+                #key = ''
+                #while key != 'q':
+                #    key = stdsrc.getch()
+                #    stdscr.refresh()
     
                 all_queue = set()
                 printarray1 = []
@@ -219,7 +242,7 @@ if __name__ == "__main__":
                                 processed_time_readable = str((datetime.datetime.now() - startTime_readable)).split('.')[0]
     
                                 if int(card) > 0:
-                                if int((datetime.datetime.now() - startTime_readable).total_seconds()) > threshold_stucked_module:
+                                    if int((datetime.datetime.now() - startTime_readable).total_seconds()) > args.treshold:
                                         log = open(log_filename, 'a')
                                         log.write(json.dumps([queue, card, str(startTime_readable), str(processed_time_readable), path]) + "\n")
                                         try:
@@ -247,15 +270,18 @@ if __name__ == "__main__":
                                 printarray3.append([curr_queue, "No data"])
                             else:
                                 #If no info since long time, try to kill
-                            if args.autokill == 1 and int(time.time()) - no_info_modules[curr_queue] > threshold_stucked_module:
+                                if args.autokill == 1:
+                                    if int(time.time()) - no_info_modules[curr_queue] > args.treshold:
                                         kill_module(curr_queue, None)
                                         no_info_modules[curr_queue] = int(time.time())
-                            printarray3.append([curr_queue, "Stuck or idle, restarting in " + str(threshold_stucked_module - (int(time.time()) - no_info_modules[curr_queue])) + "s"])
+                                    printarray3.append([curr_queue, "Stuck or idle, restarting in " + str(abs(args.treshold - (int(time.time()) - no_info_modules[curr_queue]))) + "s"])
+                                else:
+                                    printarray3.append([curr_queue, "Stuck or idle, restarting disabled"])
     
+                ## FIXME To add:
+                ## Button KILL Process using  Curses
     
-            #printarray1.sort(lambda x,y: cmp(x[0], y[0]), reverse=False)
                 printarray1.sort(key=lambda x: x[0][9:], reverse=False)
-            #printarray2.sort(lambda x,y: cmp(x[0], y[0]), reverse=False)
                 printarray2.sort(key=lambda x: x[0][9:], reverse=False)
                 printarray1.insert(0,["Queue", "PID", "Amount", "Paste start time", "Processing time for current paste (H:M:S)", "Paste hash"])
                 printarray2.insert(0,["Queue", "PID","Amount", "Paste start time", "Time since idle (H:M:S)", "Last paste hash"])
@@ -307,6 +333,12 @@ if __name__ == "__main__":
                 t4 = AsciiTable(printarray4, title="Last actions")
                 t4.column_max_width(1)
     
+                legend_array = [["Color", "Meaning"], [Back.RED+Style.BRIGHT+" "*10+Style.RESET_ALL, "Time >=" +str(args.treshold)+Style.RESET_ALL], [Back.MAGENTA+Style.BRIGHT+" "*10+Style.RESET_ALL, "Time >=" +str(args.treshold)+" while idle"+Style.RESET_ALL], [Back.YELLOW+Style.BRIGHT+" "*10+Style.RESET_ALL, "Time >=" +str(args.treshold/2)+Style.RESET_ALL], [Back.GREEN+Style.BRIGHT+" "*10+Style.RESET_ALL, "Time <" +str(args.treshold)]]
+                legend = AsciiTable(legend_array, title="Legend")
+                legend.column_max_width(1)
+    
+                print legend.table
+                print '\n'
                 print t1.table
                 print '\n'
                 print t2.table
@@ -318,4 +350,4 @@ if __name__ == "__main__":
                 if (datetime.datetime.now() - lastTime).total_seconds() > args.refresh*5: 
                     lastTime = datetime.datetime.now()
                     cleanRedis()
-            time.sleep(args.refresh)
+                #time.sleep(args.refresh)