# HG changeset patch # User morphbr # Date 1180980336 -3600 # Node ID f92cd43fea7d579bd25e4526514f50cce87369c1 # Parent fe8ddffd7f5c7ffe88f2fd7dcbb86a649940b317 [svn r749] * GMyth-Streamer - Bug fixes diff -r fe8ddffd7f5c -r f92cd43fea7d gmyth-stream/server/0.3/lib/request_handler.py --- a/gmyth-stream/server/0.3/lib/request_handler.py Mon Jun 04 12:30:07 2007 +0100 +++ b/gmyth-stream/server/0.3/lib/request_handler.py Mon Jun 04 19:05:36 2007 +0100 @@ -73,6 +73,9 @@ action = self.query.get("action", None) if action and "stream.do" in action: self.serve_stream(body) + elif os.path.exists("html/%s" % self.path): + data = open("html/%s" % self.path) + self.wfile.write(data.read()) else: self.send_error(404, "File not found") @@ -215,6 +218,7 @@ for tid in tids: stat = self.transcoders_log.get_status(int(tid)) self.wfile.write("%s
" % stat) + return True elif self.query.get("running", None): for transcoder, request in tl: @@ -329,7 +333,7 @@ self.send_response(200) self.send_header("Content-Type", obj.get_mimetype()) - self.send_header('Connection', 'close') + self.send_header("Connection", "close") self.end_headers() if body: @@ -353,7 +357,7 @@ try: media = open(self.query.get("uri", None)[0]) self.wfile.write(media.read()) - except Exception: + except Exception, e: self.log.error("Stream error: %s" %e) # serve_stream()