Changeset 350

Timestamp:

09/10/08 23:57:56 (4 months ago)

Author:

andy

Message:

Add in try/except block around removing lockfiles, when already inside an exception handler, so we dont mask a more serious exception

Also, parse the 'indytube.conf' file from the directory that the script starts from.

Files:

• indytube/branches/plumi-0.2.1/indytube.py (modified) (2 diffs)

indytube/branches/plumi-0.2.1/indytube.py

@@ -185 +185 @@
                                         except:
                                                 logging.info("Error while processing %s: %s" % (videofile,traceback.format_exc()))
-                                                os.remove(lockfile)
-                                                #remove this process's lockfile, this exception will stop the entire process
-                                                os.remove(self.ENCODER_LOCKFILE)
+                                                try:
+                                                        os.remove(lockfile)
+                                                        #remove this process's lockfile, this exception will stop the entire process
+                                                        os.remove(self.ENCODER_LOCKFILE)
+                                                except:
+                                                        pass
 
                                 else:
@@ -216 +219 @@
     indytuber = IndyTubeTranscoder()
     #parse our config
-    indytuber.parse_config('indytube.conf')
+    #find the indytube.conf in the directory that script runs from
+    indyconf_path = os.path.dirname(sys.argv[0]) + '/indytube.conf'
+    indytuber.parse_config(indyconf_path)
     #we have started!
     logging.info("started main function at %s, calling loop every %s seconds " % (time.strftime("%D %H:%M:%S"), indytuber.POLLTIME))