bug

log_handler.py

@@ -2,11 +2,10 @@
 #coding: utf-8
 
 import os
-import sys
 import time
+import psutil
+from datetime import datetime
 
-cur_dir = os.path.dirname(__file__)
-sys.path.append('%s/webroot/AutoSa/' % cur_dir)
 os.environ['DJANGO_SETTINGS_MODULE'] = 'jumpserver.settings'
 
 import django
@@ -14,28 +13,24 @@ django.setup()
 from jlog.models import Log
 
 
-def log_hanler(pid):
-    log = Log.objects.filter(id=pid)
+def log_hanler(id):
+    log = Log.objects.get(id=id)
     if log:
-        log = log[0]
-        filename = log.logfile
+        filename = log.log_path
         if os.path.isfile(filename):
             ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename))
             ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename))
             ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename))
             if (ret1 + ret2 + ret3) == 0:
                 print 'Handler %s ok.' % filename
+            log.log_finished = True
+            log.save()
 
 
 def set_finish(id):
-    logs = Log.objects.filter(id=id, finish=0)
-    if logs:
-        structtime_start = time.localtime()
-        timestamp_end = int(time.mktime(structtime_start))
-        log = logs[0]
-        log.finish = 1
-        log.end_time = timestamp_end
-        log.save()
+    log = Log.objects.filter(id=id)
+    if log:
+        log.update(is_finished=1, end_time=datetime.now())
 
 
 def kill_pid(pid):
@@ -45,52 +40,37 @@ def kill_pid(pid):
         pass
 
 
-def pid_exist(pid):
-    pid_dir = "/proc/%s" % pid
-    if os.path.isdir(pid_dir):
-        return True
-    else:
-        return False
-
-
-def del_pid(pid_id):
-    pid = Pid.objects.filter(id=pid_id)
-    if pid:
-        pid[0].delete()
-
-
 def get_pids():
-    pids = []
-    pids_obj = Pid.objects.all()
-    for pid_obj in pids_obj:
-        pids.append((pid_obj.id, pid_obj.ppid, pid_obj.cpid, pid_obj.pid, pid_obj.start_time))
-    return pids
+    pids1, pids2 = [], []
+    pids1_obj = Log.objects.filter(is_finished=0)
+    pids2_obj = Log.objects.filter(is_finished=1, log_finished=0)
+    for pid_obj in pids1_obj:
+        pids1.append((pid_obj.id, pid_obj.pid, pid_obj.log_path, pid_obj.is_finished, pid_obj.log_finished, pid_obj.start_time))
+    for pid_obj in pids2_obj:
+        pids2.append(pid_obj.id)
+
+    return pids1, pids2
 
 
 def run():
-    for pid_id, ppid, cpid, pid, start_time in get_pids():
-        if pid_exist(cpid):
-            if pid_exist(ppid):
-                structtime_start = time.localtime()
-                timestamp_end = int(time.mktime(structtime_start))
-                if timestamp_end - start_time > 7200:
-                    kill_pid(ppid)
-                    kill_pid(cpid)
-                    del_pid(pid_id)
-                    set_finish(pid)
-                    log_hanler(pid)
-            else:
-                kill_pid(cpid)
-                del_pid(pid_id)
-                set_finish(pid)
-                log_hanler(pid)
-        else:
-            del_pid(pid_id)
-            set_finish(pid)
-            log_hanler(pid)
+    pids1, pids2 = get_pids()
+    for pid_id in pids2:
+        log_hanler(pid_id)
 
+    for pid_id, pid, log_path, is_finished, log_finished, start_time in pids1:
+        print pid_id, start_time, type(start_time)
+        try:
+            file_time = int(os.stat(log_path).st_ctime)
+            now_time = int(time.time())
+            if now_time - file_time > 18000:
+                if psutil.pid_exists(pid):
+                    kill_pid(pid)
+                set_finish(pid_id)
+                log_hanler(pid_id)
+        except OSError:
+            pass
 
 if __name__ == '__main__':
     while True:
         run()
-        time.sleep(0.5)
+        time.sleep(5)