diff options
| author | Karel Klic <kklic@redhat.com> | 2011-05-13 18:32:06 +0200 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2011-05-13 18:32:06 +0200 |
| commit | e16a562d8616d2ac55f58b091f95acd5b3174229 (patch) | |
| tree | bf5c97a4ab4d4f792c436d4ed93a1c36cd381c3b /src/retrace/retrace.py | |
| parent | 15473d2a5ecfd20bd8cc3982e703fcedd51289f8 (diff) | |
| parent | e123c5f3b4bdd10f3b495a4a948f6c452ed6205f (diff) | |
| download | abrt-e16a562d8616d2ac55f58b091f95acd5b3174229.tar.gz abrt-e16a562d8616d2ac55f58b091f95acd5b3174229.tar.xz abrt-e16a562d8616d2ac55f58b091f95acd5b3174229.zip | |
merge
Diffstat (limited to 'src/retrace/retrace.py')
| -rw-r--r-- | src/retrace/retrace.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/retrace/retrace.py b/src/retrace/retrace.py index 39588d90..56bfd46e 100644 --- a/src/retrace/retrace.py +++ b/src/retrace/retrace.py @@ -21,7 +21,7 @@ PACKAGE_PARSER = re.compile("^(.+)-([0-9]+(\.[0-9]+)*-[0-9]+)\.([^-]+)$") DF_OUTPUT_PARSER = re.compile("^([^ ^\t]*)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+)[ \t]+([0-9]+%)[ \t]+(.*)$") DU_OUTPUT_PARSER = re.compile("^([0-9]+)") URL_PARSER = re.compile("^/([0-9]+)/?") -WORKER_RUNNING_PARSER = re.compile("^([0-9]+)[ \t]+[0-9]+[ \t]+([^ ^\t]+)[ \t]+.*abrt-retrace-worker ([0-9]+)$") +WORKER_RUNNING_PARSER = re.compile("^[ \t]*([0-9]+)[ \t]+[0-9]+[ \t]+([^ ^\t]+)[ \t]+.*abrt-retrace-worker ([0-9]+)$") HANDLE_ARCHIVE = { "application/x-xz-compressed-tar": { @@ -315,7 +315,7 @@ def kill_process_and_childs(process_id, ps_output=None): return result -def cleanup_task(taskid): +def cleanup_task(taskid, gc=True): null = open("/dev/null", "w") savedir = "%s/%d" % (CONFIG["SaveDir"], taskid) @@ -334,12 +334,13 @@ def cleanup_task(taskid): except: pass - try: - log = open(newlog, "a") - log.write("Killed by garbage collector\n") - log.close() - except: - pass + if gc: + try: + log = open(newlog, "a") + log.write("Killed by garbage collector\n") + log.close() + except: + pass null.close() |