Changeset 56:911c57416443 in livinglogic.python.tipimaid

Timestamp:

12/23/08 14:28:44 (10 years ago)

Author:

Nikolas Tautenhahn <nik@…>

Branch:

default

Message:

added sighandlers for sender in case apache kills its piped logger

Files:

• liaalh_sender.py (modified) (5 diffs)

liaalh_sender.py

@@ -44 +44 @@
         self.last_check_connection = datetime.datetime.now()
         signal.signal(signal.SIGALRM, self.timeout)
+        signal.signal(signal.SIGHUP, self.sighandler)
+        signal.signal(signal.SIGTERM, self.sighandler)
+        signal.signal(signal.SIGINT, self.sighandler)
+        signal.signal(signal.SIGQUIT, self.sighandler)
 
     def readlines(self):
@@ -92 +96 @@
                 self.s = None
                 self.last_check_connection = self.startedbuffering = datetime.datetime.now()
-                sys.stderr.write("%s (%s): Socket connection lost, starting to log to buffer and/or recovery file" % (self.progname, self.startedbuffering.isoformat()))
+                sys.stderr.write("%s (%s): Socket connection lost, starting to log to buffer and/or recovery file\n" % (self.progname, self.startedbuffering.isoformat()))
                 self.send_tempfile(line)
             signal.alarm(0)
@@ -142 +146 @@
                             self.buffer = self.buffer[i:] # and the content which was transmitted to the server in time
                             return
-                    sys.stderr.write("%s (%s): Socket connection established again, all data could be sent to the server" % (self.progname, self.last_check_connection.isoformat()))
+                    sys.stderr.write("%s (%s): Socket connection established again, all data could be sent to the server\n" % (self.progname, self.last_check_connection.isoformat()))
                     self.buffer = [] # if we arrive here everything was sent successfully
 
@@ -199 +203 @@
             raise
 
+    def sighandler(self, signum, frame):
+        self.flush_buffer()
+        if signum in (signal.SIGQUIT, signal.SIGTERM, signal.SIGINT):
+            sys.exit(signum)
+
+
 def main(args=None):
     import optparse
@@ -210 +220 @@
         sys.stderr.flush()
         return 1
-    S = Sender(args[0], intify(args[1], None), intify(options.buffertime, 0), options.backuppath, p.get_prog_name())
+    S = Sender(args[0], intify(args[1], None), intify(options.buffertime, 0), options.backuppath, sys.stdin, p.get_prog_name())
     S.send()