From 212af9eee61d211efb966bba7602673f8d782cc7 Mon Sep 17 00:00:00 2001
From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Fri, 13 Sep 2013 12:50:05 -0400
Subject: [PATCH] compresslog now working correctly

Tested to flush correctly / not lose any data in these scenarios

 - SIGUSR1 compresslog
 - SIGTERM compresslog
 - apache stop / restart
 - SIGTERM httpd
 - SIGKILL httpd

of course if we SIGKILL compresslog it will lose whatever it has buffered
---
 compresslog.py | 97 +++++++++++++++++++++++-----------------------------------
 1 file changed, 38 insertions(+), 59 deletions(-)
 rewrite compresslog.py (66%)

diff --git a/compresslog.py b/compresslog.py
dissimilarity index 66%
index 7ab3062..e1e099a 100755
--- a/compresslog.py
+++ b/compresslog.py
@@ -1,59 +1,38 @@
-#!/usr/bin/python
-
-import sys
-import signal
-import zlib
-import time
-import struct
-
-# init globals used in sig handler
-compressor = zlib.compressobj()
-
-def flushall():
-	buf = compressor.flush(zlib.Z_FULL_FLUSH)
-	sys.stdout.write(buf)
-	sys.stdout.flush()
-
-def sig_flush(signum, frame):
-	flushall()
-
-def sig_flushexit(signum, frame):
-	flushall()
-	sys.exit()
-
-# gzip utilities cribbed from GZip module - 
-def write32u(output, value):
-    # The L format writes the bit pattern correctly whether signed
-    # or unsigned.
-    output.write(struct.pack("<L", value))
-
-def write_gzip_header():
-    sys.stdout.write('\037\213')             # magic header
-    sys.stdout.write('\010')                 # compression method
-    fname = ''
-    flags = 0
-    sys.stdout.write(chr(flags))
-    mtime = time.time()
-    write32u(sys.stdout, long(mtime))
-    sys.stdout.write('\002')
-    sys.stdout.write('\377')
-
-## ensure we flush on various signals
-# USR1/USR2: user asked to flush out
-# HUP: apache is no longer writing to us (hung up)
-# TERM: apache is shutting us down
-signal.signal(signal.SIGUSR1, sig_flush)
-signal.signal(signal.SIGUSR2, sig_flush)
-signal.signal(signal.SIGHUP,  sig_flushexit)
-signal.signal(signal.SIGTERM, sig_flushexit)
-
-
-# get on with the job
-write_gzip_header()
-
-for line in sys.stdin.readlines():
-	buf = compressor.compress(line)
-	sys.stdout.write(buf)
-
-# flush on EOF
-flushall()
+#!/usr/bin/python
+
+## echo | compresslog /path/to/my/log
+
+import sys
+import signal
+import gzip
+import zlib
+
+## init globals used in sig handler
+# fh in append, binary
+f = gzip.open(sys.argv[1], 'ab')
+
+def sig_flush(signum, frame):
+	f.flush(zlib.Z_FULL_FLUSH)
+
+def sig_flushexit(signum, frame):
+	f.close()
+
+## ensure we flush on various signals
+# USR1/USR2: user asked to flush out
+# HUP: apache is no longer writing to us (hung up)
+# TERM: apache is shutting us down
+signal.signal(signal.SIGUSR1, sig_flush)
+signal.signal(signal.SIGUSR2, sig_flush)
+signal.signal(signal.SIGHUP,  sig_flushexit)
+signal.signal(signal.SIGTERM, sig_flushexit)
+
+# while / readline() sidesteps magic input buffering
+while 1:
+	line = sys.stdin.readline()
+	if not line:
+		break
+	if not f.closed:
+		f.write(line)
+
+if not f.closed:
+	f.close()
-- 
2.11.4.GIT