Author: duncan
Date: Wed Oct 31 15:41:55 2007
New Revision: 10047
Log:
[ 1640870 ] twisted.internet.app no more in twisted-2.5.0
Remaining servers converted to Twisted-2.5
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/commdetectcore.py
branches/rel-1-7/freevo/src/encodingcore.py
branches/rel-1-7/freevo/src/helpers/commdetectserver.py
branches/rel-1-7/freevo/src/helpers/encodingserver.py
branches/rel-1-7/freevo/src/helpers/rssserver.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/commdetectcore.py
branches/rel-1/freevo/src/encodingcore.py
branches/rel-1/freevo/src/helpers/commdetectserver.py
branches/rel-1/freevo/src/helpers/encodingserver.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/helpers/rssserver.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Wed Oct 31 15:41:55 2007
@@ -32,6 +32,7 @@
* Updated LCD plug-in to allow a 16x4 mode (F#1776450)
* Updated alsamixer with event args and synchronous mixer control (F#1767928)
* Updated osd overscan to allow different margins for all sides
(F#1791026,B#1813244)
+ * Updated servers, record, web, etc. to allow Twosted-2.5 to be used
(F#1640870)
* Updated shopping cart plug-in at allow items to removed as well (F#1807315)
* Updated submenu selection when there is only one action to execute the
action (F#1774569)
* Updated tv favourite handling and programme item to provide a consistent
interface (F#1776909)
Modified: branches/rel-1-7/freevo/src/commdetectcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/commdetectcore.py (original)
+++ branches/rel-1-7/freevo/src/commdetectcore.py Wed Oct 31 15:41:55 2007
@@ -32,12 +32,6 @@
from copy import copy
from string import split, join
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- self.log.debug(String(text))
- except:
- print(String(text))
class CommDetectJob:
"""Class for creation & configuration of CommDetectJobs. This generates
the mencoder commands"""
@@ -214,14 +208,11 @@
class CommDetectQueue:
"""Class for generating an commdetect queue"""
- def __init__(self, logger, debug=0):
+ def __init__(self):
#we keep a list and a dict because a dict doesn't store an order
- global DEBUG
- DEBUG = debug
self.qlist = []
self.qdict = {}
self.running = False
- self.log = logger
def addCommDetectJob(self, encjob):
"""Adds an commdetectjob to the queue"""
Modified: branches/rel-1-7/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/encodingcore.py (original)
+++ branches/rel-1-7/freevo/src/encodingcore.py Wed Oct 31 15:41:55 2007
@@ -650,14 +650,11 @@
class EncodingQueue:
"""Class for generating an encoding queue"""
- def __init__(self, logger, debug=0):
+ def __init__(self):
#we keep a list and a dict because a dict doesn't store an order
- global DEBUG
- DEBUG = debug
self.qlist = []
self.qdict = {}
self.running = False
- self.log = logger
#remove old files
self._removeTmp()
@@ -793,10 +790,7 @@
#print cl
#print conc(cl[0])
#print conc(cl[1])
- import logging
- log = logging.getLogger('EncodingCore')
- log.setLevel(logging.DEBUG)
- queue = encodingqueue(log, 2)
+ queue = encodingqueue()
queue.addEncodingJob(encjob)
queue.startqueue()
Modified: branches/rel-1-7/freevo/src/helpers/commdetectserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/commdetectserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/commdetectserver.py Wed Oct 31
15:41:55 2007
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# CommDetectServer.py, part of Commercial Detection Server - for use with
Freevo
+# Commercial Detection Server - for use with Freevo
# -----------------------------------------------------------------------
#
# Author: Justin Wetherell
@@ -44,10 +43,8 @@
except Exception, e:
print e
-from twisted.web import xmlrpc, server
-from twisted.internet.app import Application
+from twisted.web import xmlrpc, server, sux
from twisted.internet import reactor
-from twisted.python import log
from util.marmalade import jellyToXML, unjellyFromXML
import time, random, sys, os
import logging
@@ -57,16 +54,6 @@
DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or
config.DEBUG
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- log.debug(String(text))
- except:
- print String(text)
-
tmppath = '/tmp/commdetectserver'
jam = jellyToXML
@@ -75,7 +62,7 @@
class CommDetectServer(xmlrpc.XMLRPC):
def __init__(self, debug=False):
self.jobs = {}
- self.queue = CommDetectQueue(log, DEBUG)
+ self.queue = CommDetectQueue()
_debug_("CommDetectServer started...", DINFO)
def xmlrpc_echotest(self, blah):
@@ -124,22 +111,9 @@
commdetectcore.DEBUG=True
else:
es = CommDetectServer()
- _debug_('main: DEBUG=%s' % DEBUG, DINFO)
- if (DEBUG == 0):
- app.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es,
logPath='/dev/null'))
- else:
- app.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es))
- app.run(save=0)
+ _debug_('DEBUG=%s' % DEBUG, DINFO)
+ reactor.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es))
+ reactor.run()
if __name__ == '__main__':
- import traceback
- while 1:
- try:
- start = time.time()
- main()
- break
- except:
- traceback.print_exc()
- if start + 10 > time.time():
- _debug_('server problem, sleeping 1 min', DINFO)
- time.sleep(60)
+ main()
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 Wed Oct 31
15:41:55 2007
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# EncodingServer.py, part of EncodingServer - for use with Freevo
+# EncodingServer daemon, manages the encoding queue
# -----------------------------------------------------------------------
# $Id$
#
@@ -48,9 +47,7 @@
print e
from twisted.web import xmlrpc, server
-from twisted.internet.app import Application
from twisted.internet import reactor
-from twisted.python import log
from util.marmalade import jellyToXML, unjellyFromXML
import time, random, sys, os
import logging
@@ -66,36 +63,15 @@
DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or
config.DEBUG
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- log.debug(String(text))
- except:
- print String(text)
-
jam = jellyToXML
unjam = unjellyFromXML
+
class EncodingServer(xmlrpc.XMLRPC):
def __init__(self, debug=False):
self.jobs = {}
-
- #setup a logger
- #if debug: #when debugging, output everything to stdout using the root
logging class
- # self.log = logging
- #else: #normally, write nice formatted messages to a logfile)
- # self.log = logging.getLogger("EncodingServer")
- # self.log.setLevel(logging.INFO)
- # FHandler = logging.FileHandler("encodingserver.log")
- #
FHandler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s
%(message)s"))
- # self.log.addHandler(FHandler)
-
- self.queue = EncodingQueue(log, DEBUG)
-
+ self.queue = EncodingQueue()
_debug_("EncodingServer started...", DINFO)
def xmlrpc_echotest(self, blah):
@@ -220,7 +196,6 @@
tmppath = tempfile.mkdtemp(prefix = 'encodeserver')
os.chdir(tmppath)
- app = Application("EncodingServer")
if len(sys.argv) >= 2 and sys.argv[1] == "debug":
es = EncodingServer(True)
import encodingcore
@@ -228,22 +203,9 @@
else:
es = EncodingServer()
_debug_('main: DEBUG=%s' % DEBUG, DINFO)
- if (DEBUG == 0):
- app.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es,
logPath='/dev/null'))
- else:
- app.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es))
- app.run(save=0)
+ reactor.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es))
+ reactor.run()
if __name__ == '__main__':
- import traceback
- while 1:
- try:
- start = time.time()
- main()
- break
- except:
- traceback.print_exc()
- if start + 10 > time.time():
- _debug_('server problem, sleeping 1 min', DINFO)
- time.sleep(60)
+ main()
Modified: branches/rel-1-7/freevo/src/helpers/rssserver.py
==============================================================================
--- branches/rel-1-7/freevo/src/helpers/rssserver.py (original)
+++ branches/rel-1-7/freevo/src/helpers/rssserver.py Wed Oct 31 15:41:55 2007
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# rssserver.py - This is the Freevo RSS feed server
+# This is the Freevo RSS feed server
# -----------------------------------------------------------------------
# $Id$
#
@@ -28,7 +28,7 @@
#
# -----------------------------------------------------------------------
-'''
+"""
In local_conf.py add the following:
# File defining RSS feeds to monitor (see format below).
@@ -53,12 +53,11 @@
http://www.thelinuxlink.net/tllts/tllts.rss;30
http://www.linux-games.ca/2006/redneck.xml;360
# End /etc/freevo/rss.feeds
-'''
+"""
-import os,sys,threading,time
+import os, sys, threading, time
import rssperiodic
import config
-from twisted.python import log
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
appconf = appname.upper()
@@ -82,9 +81,6 @@
sys.exit(0)
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
# check for expired files and delete them
to = threading.Thread(rssperiodic.checkForExpiration())
to.start()
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Oct 31 15:41:55 2007
@@ -32,6 +32,7 @@
* Updated LCD plug-in to allow a 16x4 mode (F#1776450)
* Updated alsamixer with event args and synchronous mixer control (F#1767928)
* Updated osd overscan to allow different margins for all sides
(F#1791026,B#1813244)
+ * Updated servers, record, web, etc. to allow Twosted-2.5 to be used
(F#1640870)
* Updated shopping cart plug-in at allow items to removed as well (F#1807315)
* Updated submenu selection when there is only one action to execute the
action (F#1774569)
* Updated tv favourite handling and programme item to provide a consistent
interface (F#1776909)
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Wed Oct 31 15:41:55 2007
@@ -341,7 +341,7 @@
Moved plug-in "upsoon" to "tv.upsoon"
''' ),
(5.22,
- '''Added RECORDSERVER_SECRET
+ '''Added RECORDSERVER_SECRET and RECORDSERVER_PORT2=18002 for kaa.rpc
'''),
]
@@ -1705,6 +1705,7 @@
RECORDSERVER_IP = 'localhost'
RECORDSERVER_PORT = 18001
+RECORDSERVER_PORT2 = 18002
RECORDSERVER_SECRET = 'secret1'
# If the recordserver runs as root, set the uid to the given one
Modified: branches/rel-1/freevo/src/commdetectcore.py
==============================================================================
--- branches/rel-1/freevo/src/commdetectcore.py (original)
+++ branches/rel-1/freevo/src/commdetectcore.py Wed Oct 31 15:41:55 2007
@@ -32,12 +32,6 @@
from copy import copy
from string import split, join
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- self.log.debug(String(text))
- except:
- print(String(text))
class CommDetectJob:
"""Class for creation & configuration of CommDetectJobs. This generates
the mencoder commands"""
@@ -214,14 +208,11 @@
class CommDetectQueue:
"""Class for generating an commdetect queue"""
- def __init__(self, logger, debug=0):
+ def __init__(self):
#we keep a list and a dict because a dict doesn't store an order
- global DEBUG
- DEBUG = debug
self.qlist = []
self.qdict = {}
self.running = False
- self.log = logger
def addCommDetectJob(self, encjob):
"""Adds an commdetectjob to the queue"""
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Wed Oct 31 15:41:55 2007
@@ -650,14 +650,11 @@
class EncodingQueue:
"""Class for generating an encoding queue"""
- def __init__(self, logger, debug=0):
+ def __init__(self):
#we keep a list and a dict because a dict doesn't store an order
- global DEBUG
- DEBUG = debug
self.qlist = []
self.qdict = {}
self.running = False
- self.log = logger
#remove old files
self._removeTmp()
@@ -793,10 +790,7 @@
#print cl
#print conc(cl[0])
#print conc(cl[1])
- import logging
- log = logging.getLogger('EncodingCore')
- log.setLevel(logging.DEBUG)
- queue = encodingqueue(log, 2)
+ queue = encodingqueue()
queue.addEncodingJob(encjob)
queue.startqueue()
Modified: branches/rel-1/freevo/src/helpers/commdetectserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/commdetectserver.py (original)
+++ branches/rel-1/freevo/src/helpers/commdetectserver.py Wed Oct 31
15:41:55 2007
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# CommDetectServer.py, part of Commercial Detection Server - for use with
Freevo
+# Commercial Detection Server - for use with Freevo
# -----------------------------------------------------------------------
#
# Author: Justin Wetherell
@@ -44,10 +43,8 @@
except Exception, e:
print e
-from twisted.web import xmlrpc, server
-from twisted.internet.app import Application
+from twisted.web import xmlrpc, server, sux
from twisted.internet import reactor
-from twisted.python import log
from util.marmalade import jellyToXML, unjellyFromXML
import time, random, sys, os
import logging
@@ -57,16 +54,6 @@
DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or
config.DEBUG
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- log.debug(String(text))
- except:
- print String(text)
-
tmppath = '/tmp/commdetectserver'
jam = jellyToXML
@@ -75,7 +62,7 @@
class CommDetectServer(xmlrpc.XMLRPC):
def __init__(self, debug=False):
self.jobs = {}
- self.queue = CommDetectQueue(log, DEBUG)
+ self.queue = CommDetectQueue()
_debug_("CommDetectServer started...", DINFO)
def xmlrpc_echotest(self, blah):
@@ -124,22 +111,9 @@
commdetectcore.DEBUG=True
else:
es = CommDetectServer()
- _debug_('main: DEBUG=%s' % DEBUG, DINFO)
- if (DEBUG == 0):
- app.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es,
logPath='/dev/null'))
- else:
- app.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es))
- app.run(save=0)
+ _debug_('DEBUG=%s' % DEBUG, DINFO)
+ reactor.listenTCP(config.COMMDETECTSERVER_PORT, server.Site(es))
+ reactor.run()
if __name__ == '__main__':
- import traceback
- while 1:
- try:
- start = time.time()
- main()
- break
- except:
- traceback.print_exc()
- if start + 10 > time.time():
- _debug_('server problem, sleeping 1 min', DINFO)
- time.sleep(60)
+ main()
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 Wed Oct 31 15:41:55 2007
@@ -1,7 +1,6 @@
-#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# EncodingServer.py, part of EncodingServer - for use with Freevo
+# EncodingServer daemon, manages the encoding queue
# -----------------------------------------------------------------------
# $Id$
#
@@ -48,9 +47,7 @@
print e
from twisted.web import xmlrpc, server
-from twisted.internet.app import Application
from twisted.internet import reactor
-from twisted.python import log
from util.marmalade import jellyToXML, unjellyFromXML
import time, random, sys, os
import logging
@@ -66,36 +63,15 @@
DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or
config.DEBUG
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
-def _debug_(text, level=1):
- if DEBUG >= level:
- try:
- log.debug(String(text))
- except:
- print String(text)
-
jam = jellyToXML
unjam = unjellyFromXML
+
class EncodingServer(xmlrpc.XMLRPC):
def __init__(self, debug=False):
self.jobs = {}
-
- #setup a logger
- #if debug: #when debugging, output everything to stdout using the root
logging class
- # self.log = logging
- #else: #normally, write nice formatted messages to a logfile)
- # self.log = logging.getLogger("EncodingServer")
- # self.log.setLevel(logging.INFO)
- # FHandler = logging.FileHandler("encodingserver.log")
- #
FHandler.setFormatter(logging.Formatter("%(asctime)s:%(levelname)s
%(message)s"))
- # self.log.addHandler(FHandler)
-
- self.queue = EncodingQueue(log, DEBUG)
-
+ self.queue = EncodingQueue()
_debug_("EncodingServer started...", DINFO)
def xmlrpc_echotest(self, blah):
@@ -220,7 +196,6 @@
tmppath = tempfile.mkdtemp(prefix = 'encodeserver')
os.chdir(tmppath)
- app = Application("EncodingServer")
if len(sys.argv) >= 2 and sys.argv[1] == "debug":
es = EncodingServer(True)
import encodingcore
@@ -228,22 +203,9 @@
else:
es = EncodingServer()
_debug_('main: DEBUG=%s' % DEBUG, DINFO)
- if (DEBUG == 0):
- app.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es,
logPath='/dev/null'))
- else:
- app.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es))
- app.run(save=0)
+ reactor.listenTCP(config.ENCODINGSERVER_PORT, server.Site(es))
+ reactor.run()
if __name__ == '__main__':
- import traceback
- while 1:
- try:
- start = time.time()
- main()
- break
- except:
- traceback.print_exc()
- if start + 10 > time.time():
- _debug_('server problem, sleeping 1 min', DINFO)
- time.sleep(60)
+ main()
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Wed Oct 31 15:41:55 2007
@@ -1717,6 +1717,9 @@
reactor.listenTCP(config.RECORDSERVER_PORT, server.Site(rs))
rs.startMinuteCheck()
reactor.run()
+ _debug_('reactor stopped.')
+ kaa.notifier.shutdown()
+ _debug_('kaa.notifier stopped.')
#kaa.notifier.AtTimer(rs.handleTimer).start(sec=45)
#kaa.main()
@@ -1731,8 +1734,5 @@
_debug_('Removed old record lock \"%s\"' % f, DINFO)
os.remove(f)
- try:
- main()
- except Exception, e:
- traceback.print_exc()
- print 'done.'
+ main()
+ _debug_('done.')
Modified: branches/rel-1/freevo/src/helpers/rssserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/rssserver.py (original)
+++ branches/rel-1/freevo/src/helpers/rssserver.py Wed Oct 31 15:41:55 2007
@@ -1,6 +1,6 @@
# -*- coding: iso-8859-1 -*-
# -----------------------------------------------------------------------
-# rssserver.py - This is the Freevo RSS feed server
+# This is the Freevo RSS feed server
# -----------------------------------------------------------------------
# $Id$
#
@@ -28,7 +28,7 @@
#
# -----------------------------------------------------------------------
-'''
+"""
In local_conf.py add the following:
# File defining RSS feeds to monitor (see format below).
@@ -53,12 +53,11 @@
http://www.thelinuxlink.net/tllts/tllts.rss;30
http://www.linux-games.ca/2006/redneck.xml;360
# End /etc/freevo/rss.feeds
-'''
+"""
-import os,sys,threading,time
+import os, sys, threading, time
import rssperiodic
import config
-from twisted.python import log
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
appconf = appname.upper()
@@ -82,9 +81,6 @@
sys.exit(0)
-logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
-log.startLogging(open(logfile, 'a'))
-
# check for expired files and delete them
to = threading.Thread(rssperiodic.checkForExpiration())
to.start()
-------------------------------------------------------------------------
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
