Author: duncan
Date: Thu Nov 15 02:45:16 2007
New Revision: 10127
Log:
Encoding server was too noisy
Modified:
branches/rel-1-7/freevo/src/helpers/encodingserver.py
branches/rel-1/freevo/src/helpers/encodingserver.py
Modified: branches/rel-1-7/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/encodingserver.py Thu Nov 15
02:45:16 2007
@@ -71,7 +71,7 @@
def __init__(self, debug=False, allowNone=False):
""" Initialise the EncodingServer class """
- _debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 1)
+ _debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 2)
try:
xmlrpc.XMLRPC.__init__(self, allowNone)
except TypeError:
@@ -83,7 +83,7 @@
def xmlrpc_echotest(self, blah):
""" Using Twisted check the connection """
- _debug_('xmlrpc_echotest(blah=%r)' % (blah), 1)
+ _debug_('xmlrpc_echotest(blah=%r)' % (blah), 2)
return (True, 'EncodingServer::echotest: %s' % blah)
def xmlrpc_initEncodeJob(self, source, output, friendlyname="",
chapter=None):
@@ -110,12 +110,12 @@
def xmlrpc_getContainerCAP(self, idnr):
""" Using Twisted get the container capabilities """
- _debug_('xmlrpc_getContainerCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getContainerCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getContainerList()))
def xmlrpc_setContainer(self, idnr, container):
""" Using Twisted set the container """
- _debug_('xmlrpc_setContainer(idnr=%r, container=%r)' % (idnr,
container), 1)
+ _debug_('xmlrpc_setContainer(idnr=%r, container=%r)' % (idnr,
container), 2)
status = self.jobs[idnr].setContainer(container)
if not status:
@@ -125,7 +125,7 @@
def xmlrpc_getVideoCodecCAP(self, idnr):
""" Using Twisted get the video capabilities """
- _debug_('xmlrpc_getVideoCodecCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getVideoCodecCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getVideoCodecList()))
def xmlrpc_setVideoCodec(self, idnr, vcodec, tgtsize, multipass=False,
vbitrate=0):
@@ -145,12 +145,12 @@
def xmlrpc_getAudioCodecCAP(self, idnr):
""" Using Twisted get the audio capabilities """
- _debug_('xmlrpc_getAudioCodecCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getAudioCodecCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getAudioCodecList()))
def xmlrpc_setAudioCodec(self, idnr, acodec, abrate):
""" Using Twisted set the audio codec """
- _debug_('xmlrpc_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr,
acodec, abrate), 1)
+ _debug_('xmlrpc_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr,
acodec, abrate), 2)
#safety checks
if not (acodec or abrate):
return (False, 'EncodingServer::setAudioCodec: no codec or
bitrate given')
@@ -164,13 +164,13 @@
def xmlrpc_getVideoFiltersCAP(self, idnr):
""" Using Twisted get the video filter capabilities """
- _debug_('xmlrpc_getVideoFiltersCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getVideoFiltersCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getVideoFiltersList()))
def xmlrpc_setVideoFilters(self, idnr, filters):
""" Using Twisted set the video filter list """
- _debug_('xmlrpc_setVideoFilters(idnr, filters)', 1)
+ _debug_('xmlrpc_setVideoFilters(idnr, filters)', 2)
#safety checks
if not filters:
return (False, 'EncodingServer::setAudioCodec: no codec or
bitrate given')
@@ -184,7 +184,7 @@
def xmlrpc_queueIt(self, idnr, now=False):
""" Using Twisted queue a job to run """
- _debug_('xmlrpc_queueIt(idnr=%r, now=%r)' % (idnr, now), 1)
+ _debug_('xmlrpc_queueIt(idnr=%r, now=%r)' % (idnr, now), 2)
self.queue.addEncodingJob(self.jobs[idnr])
del self.jobs[idnr]
_debug_("Added job %s to the queue" % idnr, DINFO)
@@ -194,7 +194,7 @@
def xmlrpc_getProgress(self):
""" Using Twisted get the progress status of the current job """
- _debug_('xmlrpc_getProgress()', 1)
+ _debug_('xmlrpc_getProgress()', 2)
prog = self.queue.getProgress()
if type(prog) is str:
return (False, "EncodingServer::getProgress: %s" % prog)
@@ -202,20 +202,20 @@
def xmlrpc_startQueue(self):
""" Using Twisted start the job queue """
- _debug_('xmlrpc_startQueue()', 1)
+ _debug_('xmlrpc_startQueue()', 2)
self.queue.startQueue()
return (True, "EncodingServer::startqueue: OK")
def xmlrpc_listJobs(self):
""" List the current jobs """
- _debug_('xmlrpc_listJobs()', 1)
+ _debug_('xmlrpc_listJobs()', 2)
jlist = self.queue.listJobs()
return (True, jam(jlist))
def main():
""" The main entry point for the server """
- _debug_('main()', 1)
+ _debug_('main()', 2)
global DEBUG
tmppath = tempfile.mkdtemp(prefix = 'encodeserver')
os.chdir(tmppath)
Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Thu Nov 15 02:45:16 2007
@@ -71,7 +71,7 @@
def __init__(self, debug=False, allowNone=False):
""" Initialise the EncodingServer class """
- _debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 1)
+ _debug_('EncodingServer.__init__(debug=%r, allowNone=%r)' % (debug,
allowNone), 2)
try:
xmlrpc.XMLRPC.__init__(self, allowNone)
except TypeError:
@@ -83,7 +83,7 @@
def xmlrpc_echotest(self, blah):
""" Using Twisted check the connection """
- _debug_('xmlrpc_echotest(blah=%r)' % (blah), 1)
+ _debug_('xmlrpc_echotest(blah=%r)' % (blah), 2)
return (True, 'EncodingServer::echotest: %s' % blah)
def xmlrpc_initEncodeJob(self, source, output, friendlyname="",
chapter=None):
@@ -111,12 +111,12 @@
def xmlrpc_getContainerCAP(self, idnr):
""" Using Twisted get the container capabilities """
- _debug_('xmlrpc_getContainerCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getContainerCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getContainerList()))
def xmlrpc_setContainer(self, idnr, container):
""" Using Twisted set the container """
- _debug_('xmlrpc_setContainer(idnr=%r, container=%r)' % (idnr,
container), 1)
+ _debug_('xmlrpc_setContainer(idnr=%r, container=%r)' % (idnr,
container), 2)
status = self.jobs[idnr].setContainer(container)
if not status:
@@ -126,7 +126,7 @@
def xmlrpc_getVideoCodecCAP(self, idnr):
""" Using Twisted get the video capabilities """
- _debug_('xmlrpc_getVideoCodecCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getVideoCodecCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getVideoCodecList()))
def xmlrpc_setVideoCodec(self, idnr, vcodec, tgtsize, multipass=False,
vbitrate=0):
@@ -146,12 +146,12 @@
def xmlrpc_getAudioCodecCAP(self, idnr):
""" Using Twisted get the audio capabilities """
- _debug_('xmlrpc_getAudioCodecCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getAudioCodecCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getAudioCodecList()))
def xmlrpc_setAudioCodec(self, idnr, acodec, abrate):
""" Using Twisted set the audio codec """
- _debug_('xmlrpc_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr,
acodec, abrate), 1)
+ _debug_('xmlrpc_setAudioCodec(idnr=%r, acodec=%r, abrate=%r)' % (idnr,
acodec, abrate), 2)
#safety checks
if not (acodec or abrate):
return (False, 'EncodingServer::setAudioCodec: no codec or
bitrate given')
@@ -165,13 +165,13 @@
def xmlrpc_getVideoFiltersCAP(self, idnr):
""" Using Twisted get the video filter capabilities """
- _debug_('xmlrpc_getVideoFiltersCAP(idnr=%r)' % (idnr), 1)
+ _debug_('xmlrpc_getVideoFiltersCAP(idnr=%r)' % (idnr), 2)
return (True, jam(self.jobs[idnr].getVideoFiltersList()))
def xmlrpc_setVideoFilters(self, idnr, filters):
""" Using Twisted set the video filter list """
- _debug_('xmlrpc_setVideoFilters(idnr, filters)', 1)
+ _debug_('xmlrpc_setVideoFilters(idnr, filters)', 2)
#safety checks
if not filters:
return (False, 'EncodingServer::setAudioCodec: no codec or
bitrate given')
@@ -185,7 +185,7 @@
def xmlrpc_queueIt(self, idnr, now=False):
""" Using Twisted queue a job to run """
- _debug_('xmlrpc_queueIt(idnr=%r, now=%r)' % (idnr, now), 1)
+ _debug_('xmlrpc_queueIt(idnr=%r, now=%r)' % (idnr, now), 2)
self.queue.addEncodingJob(self.jobs[idnr])
del self.jobs[idnr]
_debug_("Added job %s to the queue" % idnr, DINFO)
@@ -195,7 +195,7 @@
def xmlrpc_getProgress(self):
""" Using Twisted get the progress status of the current job """
- _debug_('xmlrpc_getProgress()', 1)
+ _debug_('xmlrpc_getProgress()', 2)
prog = self.queue.getProgress()
if type(prog) is str:
return (False, "EncodingServer::getProgress: %s" % prog)
@@ -203,20 +203,20 @@
def xmlrpc_startQueue(self):
""" Using Twisted start the job queue """
- _debug_('xmlrpc_startQueue()', 1)
+ _debug_('xmlrpc_startQueue()', 2)
self.queue.startQueue()
return (True, "EncodingServer::startqueue: OK")
def xmlrpc_listJobs(self):
""" List the current jobs """
- _debug_('xmlrpc_listJobs()', 1)
+ _debug_('xmlrpc_listJobs()', 2)
jlist = self.queue.listJobs()
return (True, jam(jlist))
def main():
""" The main entry point for the server """
- _debug_('main()', 1)
+ _debug_('main()', 2)
global DEBUG
tmppath = tempfile.mkdtemp(prefix = 'encodeserver')
os.chdir(tmppath)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
