mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
oeqa/utils/httpserver: connect up the request logging
Call logger.info() in the log_message handler so that we get request logging, and hopefully even error messages. Create a child logger to be neat and compartmentalise the logging. Add a __main__ entrypoint so this class can be exercised outside of oeqa. Remove unused traceback import. (From OE-Core rev: 8fc939d942cec1662ca386b87c63f167bb10fd05) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d8ec2bbc77
commit
f6a1c8c309
@@ -5,9 +5,9 @@
|
||||
#
|
||||
|
||||
import http.server
|
||||
import logging
|
||||
import multiprocessing
|
||||
import os
|
||||
import traceback
|
||||
import signal
|
||||
from socketserver import ThreadingMixIn
|
||||
|
||||
@@ -15,20 +15,24 @@ class HTTPServer(ThreadingMixIn, http.server.HTTPServer):
|
||||
|
||||
def server_start(self, root_dir, logger):
|
||||
os.chdir(root_dir)
|
||||
self.logger = logger
|
||||
self.serve_forever()
|
||||
|
||||
class HTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
|
||||
|
||||
def log_message(self, format_str, *args):
|
||||
pass
|
||||
self.server.logger.info(format_str, *args)
|
||||
|
||||
class HTTPService(object):
|
||||
class HTTPService:
|
||||
|
||||
def __init__(self, root_dir, host='', port=0, logger=None):
|
||||
self.root_dir = root_dir
|
||||
self.host = host
|
||||
self.port = port
|
||||
self.logger = logger
|
||||
if logger:
|
||||
self.logger = logger.getChild("HTTPService")
|
||||
else:
|
||||
self.logger = logging.getLogger("HTTPService")
|
||||
|
||||
def start(self):
|
||||
if not os.path.exists(self.root_dir):
|
||||
@@ -49,7 +53,7 @@ class HTTPService(object):
|
||||
signal.signal(signal.SIGTERM, orig)
|
||||
|
||||
if self.logger:
|
||||
self.logger.info("Started HTTPService on %s:%s" % (self.host, self.port))
|
||||
self.logger.info("Started HTTPService for %s on %s:%s" % (self.root_dir, self.host, self.port))
|
||||
|
||||
|
||||
def stop(self):
|
||||
@@ -61,3 +65,10 @@ class HTTPService(object):
|
||||
if self.logger:
|
||||
self.logger.info("Stopped HTTPService on %s:%s" % (self.host, self.port))
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys, logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
httpd = HTTPService(sys.argv[1], port=8888, logger=logger)
|
||||
httpd.start()
|
||||
|
||||
Reference in New Issue
Block a user