small fix on logger issue

Author: sw360cab

Diff for: ext-param-example.txt

@@ -1 +1 @@
-transodingString=gst-launch filesrc location=$src ! decodebin2 name=d d. ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv ! deinterlace ! ffmpegcolorspace ! x264enc profile=1 ! mp4mux name=mux ! filesink location=$dest d. ! queue ! audioconvert ! audioresample ! faac ! mux.
+transcodingString=gst-launch filesrc location=$src ! decodebin2 name=d d. ! queue ! ffmpegcolorspace ! videoscale ! video/x-raw-yuv ! deinterlace ! ffmpegcolorspace ! x264enc profile=1 ! mp4mux name=mux ! filesink location=$dest d. ! queue ! audioconvert ! audioresample ! faac ! mux.

Diff for: ftp_connector.py

@@ -3,10 +3,7 @@
 
 def connect(ftpparams):
   ftp = ftplib.FTP()
-  
-  global log
-  
-  log= t_logger.setup(__name__)
+  log= t_logger.getLogger(__name__)
 
   ftp.connect(ftpparams.host, ftpparams.port)
   if (hasattr(ftpparams,'username')):
@@ -28,6 +25,7 @@ def connect(ftpparams):
   return ftp
 
 def upload(ftp,fileName,filePath):
+  log = t_logger.getLogger(__name__)
   log.info('FTP upload of %s started @ %s:%s',fileName,ftp.host,ftp.port)
   ftp.storbinary("STOR " + fileName, open(filePath, "rb"),1024)
   log.info('FTP trasfer of %s completed',fileName)

Diff for: gst_transcoder.py

@@ -5,11 +5,10 @@
 import t_logger
 
 def transcodeFile (originalFilename,sourcePath,destPath,
-  transcodingString='''gst-launch filesrc location=$src ! decodebin2 name=d d. ! queue ! ffmpegcolorspace ! videoscale ! deinterlace !   
+  transcodingString='''gst-launch filesrc location=$src ! decodebin2 name=d d. ! queue ! ffmpegcolorspace ! videoscale ! deinterlace ! 
   x264enc profile=1 ! mp4mux name=mux ! filesink location=$dest d. ! queue ! audioconvert ! audioresample ! faac ! mux.'''):
-  print transcodingString
   # transcode using GStreamer
-  log = t_logger.setup(__name__)
+  log = t_logger.getLogger(__name__)
   log.debug('current file is: %s', originalFilename)
   sourceFile = sourcePath + os.sep + originalFilename
 

Diff for: parser.py

@@ -28,7 +28,7 @@ def parse ():
   parser.add_argument('-f','--externalfile', help='whether parameters should be taken from an external file', dest='file', action='store_const', const=True)
   parser.add_argument('-extpath','--externalfilepath', help='path of external file contining parameters', dest='extpath')
 
-  log = t_logger.setup(__name__)
+  log = t_logger.getLogger(__name__)
   log.debug('Args parsed succesfully')
 
   return parser.parse_args()

Diff for: s3_connector.py

@@ -4,11 +4,12 @@
 import os
 
 def connect(s3params):
-  log = t_logger.setup(__name__)
+  log = t_logger.getLogger(__name__)
   conn = S3Connection(s3params.s3keyid, s3params.s3secretkey)
   return conn
 
 def upload(s3,bucketName,path):
+  log = t_logger.getLogger(__name__)
   bucket = s3.create_bucket(bucketName)
   log.info('Bucket %s is OK',bucketName)
 

Diff for: t_logger.py

@@ -17,3 +17,6 @@ def setup (appName):
   logging.debug('Logger setup completed')
   return logging.getLogger(appName)
 
+def getLogger (moduleName):
+  return logging.getLogger(moduleName)
+

Diff for: transcoder.py

@@ -64,7 +64,10 @@ def main() :
         # deal with transcoding
         if (params.transcode):
           try :
-            finalName, finalPath = gst_transcoder.transcodeFile(name,root,dest,params.transodingString)
+            if (hasattr(params,'transcodingString')):
+              finalName, finalPath = gst_transcoder.transcodeFile(name,root,dest,params.transcodingString)
+            else:
+              finalName, finalPath = gst_transcoder.transcodeFile(name,root,dest)
           except RuntimeError:
             log.info("File %s NOT transcoded", root+os.sep+name) 
         # deal with ftp