1.1 --- a/gmyth-stream/server/0.2/lib/server.py Thu Apr 19 16:30:17 2007 +0100
1.2 +++ b/gmyth-stream/server/0.2/lib/server.py Fri Apr 20 21:48:57 2007 +0100
1.3 @@ -19,7 +19,7 @@
1.4 "load_plugins_transcoders")
1.5
1.6 class Transcoder(object):
1.7 - log = log.getLogger("gmyth-streamer.transcoder")
1.8 + log = log.getLogger("gms.transcoder")
1.9 priority = 0 # negative values have higher priorities
1.10 name = None # to be used in requests
1.11
1.12 @@ -62,18 +62,19 @@
1.13
1.14
1.15 def __str__(self):
1.16 - return '%s("%s", mux="%s", params=%s)' % \
1.17 + return '%s("%s", mux="%s", params=%s, addr=%s)' % \
1.18 (self.__class__.__name__,
1.19 self.params_first("uri", "None"),
1.20 self.params_first("mux", "mpg"),
1.21 - self.params)
1.22 + self.params,
1.23 + repr(self))
1.24 # __str__()
1.25 # Transcoder
1.26
1.27
1.28
1.29 class RequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
1.30 - log = log.getLogger("gmyth-streamer.request")
1.31 + log = log.getLogger("gms.request")
1.32 def_transcoder = None
1.33 transcoders = utils.PluginSet(Transcoder)
1.34
1.35 @@ -370,7 +371,7 @@
1.36
1.37
1.38 class Server(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
1.39 - log = log.getLogger("gmyth-streamer.server")
1.40 + log = log.getLogger("gms.server")
1.41 run = True
1.42 _transcoders = {}
1.43 _lock = threading.RLock()