From 654c27490d010ea62d0c55d9758bfc23cf4d2cb3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 4 Nov 2014 00:22:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4pid?= =?UTF-8?q?=E6=9D=A1=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/AutoSa/log_handler.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/webroot/AutoSa/log_handler.py b/webroot/AutoSa/log_handler.py index e0e6c7192..ed35864a6 100755 --- a/webroot/AutoSa/log_handler.py +++ b/webroot/AutoSa/log_handler.py @@ -48,16 +48,22 @@ def pid_exist(pid): 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.ppid, pid_obj.cpid, pid_obj.logid, pid_obj.start_time)) + pids.append((pid_obj.id, pid_obj.ppid, pid_obj.cpid, pid_obj.logid, pid_obj.start_time)) return pids def run(): - for ppid, cpid, logid, start_time in get_pids(): + for pid_id, ppid, cpid, logid, start_time in get_pids(): if pid_exist(cpid): if pid_exist(ppid): structtime_start = time.localtime() @@ -65,13 +71,16 @@ def run(): if timestamp_end - start_time > 7200: kill_pid(ppid) kill_pid(cpid) + del_pid(pid_id) set_finish(logid) log_hanler(logid) else: kill_pid(cpid) + del_pid(pid_id) set_finish(logid) log_hanler(logid) else: + del_pid(pid_id) set_finish(logid) log_hanler(logid)