Changeset 230 for indytube/trunk

Timestamp:

10/14/07 09:39:11 (15 months ago)

Author:

andy

Message:

install a siganl handler on USR2, so that indytube will re-read its configuration file

Files:

• indytube/trunk/indytube.py (modified) (6 diffs)

indytube/trunk/indytube.py

@@ -8 +8 @@
 import traceback
 import sys
+import signal
 
 #3rd party libraries
@@ -20 +21 @@
    checked = 0
    converted = 0
+   conf_file = ""
 
    def __init__(self):
         """constructor for IndyTubeTranscoder"""
+
+   def rereadConfig(self,signal,frame):
+        self.parse_config(self.conf_file)
 
    def parse_config(self,conf_file):
@@ -28 +33 @@
         config = ConfigParser.RawConfigParser()
         config.read(conf_file)
+        self.conf_file = conf_file
+
 
         self.MENCODER_LOCATION=config.get('mencoder','MENCODER_LOCATION')
@@ -58 +65 @@
         self.LOG_LEVEL=eval(config.get('logging','LOG_LEVEL'))
 
+        self.ENCODER_LOCKFILE = ""
+
         logging.basicConfig(level=self.LOG_LEVEL, format='%(asctime)s %(levelname)s %(message)s', filename=self.LOG_FILE, filemode='a') 
 
-        self.ENCODER_LOCKFILE = ""
+        logging.info("finished parse_config function at %s, using file %s " % (time.strftime("%D %H:%M:%S"), self.conf_file))
 
    def check_lock_file(self):
@@ -101 +110 @@
 
 def attempt_transcode_file(self, f):
-        '''Start the transcoding attempt with file 'f'. Converts to FLV format, possibly OGG/Theora in future. Produces HTML snippets for including
+        '''Start the transcoding attempt with file 'f'. Converts to FLV format, and OGG/Theora. Produces HTML snippets for including
            the players appropriate for the produced video format. At the moment, this is FlowPlayer for FLV, and Cortado java applet for OGG/Theora '''
         #whether or not the transcoding worked for the given file 'f'
@@ -212 +221 @@
         # passing along the indytube object as an argument. (try not to _call_ this function or else you'll end up in infinite recursion!)
         reactor.callLater(indytuber.POLLTIME,looperInvoker,indytuber)
-
+  
     #make an IndyTubeTranscoder object
     indytuber = IndyTubeTranscoder()
     #parse our config
     indytuber.parse_config('indytube.conf')
+
     #we have started!
     logging.info("started main function at %s, calling loop every %s seconds " % (time.strftime("%D %H:%M:%S"), indytuber.POLLTIME))
     #start it for real, once off
     looperInvoker(indytuber)
+
+    #install a signal handler to re-read configuration files.
+    signal.signal(signal.SIGUSR2, indytuber.rereadConfig)
+
     #start the twisted reactor
     # see http://twistedmatrix.com/trac/wiki/FrequentlyAskedQuestions#Igetexceptions.ValueError:signalonlyworksinmainthreadwhenItrytorunmyTwistedprogramWhatswrong