diff --git a/src/python/skywriting/runtime/master/__init__.py b/src/python/skywriting/runtime/master/__init__.py index 443a3ca..86459ce 100644 --- a/src/python/skywriting/runtime/master/__init__.py +++ b/src/python/skywriting/runtime/master/__init__.py @@ -95,9 +95,6 @@ def master_main(options): cherrypy_conf = dict() - if options.staticbase is not None: - cherrypy_conf["/skyweb"] = { "tools.staticdir.on": True, "tools.staticdir.dir": options.staticbase } - app = cherrypy.tree.mount(root, "", cherrypy_conf) lighty_conf_template = resource_filename(Requirement.parse("ciel"), "resources/lighttpd.conf") if lighty_conf_template is not None: diff --git a/src/python/skywriting/runtime/worker/__init__.py b/src/python/skywriting/runtime/worker/__init__.py index 8f93d62..e6f04f4 100644 --- a/src/python/skywriting/runtime/worker/__init__.py +++ b/src/python/skywriting/runtime/worker/__init__.py @@ -38,6 +38,7 @@ from skywriting.runtime.worker.multiworker import MultiWorker from skywriting.runtime.pycurl_thread import create_pycurl_thread from skywriting.runtime.tcp_server import create_tcp_server +from pkg_resources import Requirement, resource_filename class WorkerState: pass @@ -67,7 +68,7 @@ def __init__(self, bus, port, options): # else: # self.hostname = options.hostname - self.lighty_conf_template = options.lighty_conf + self.lighty_conf_template = resource_filename(Requirement.parse("ciel"), "resources/lighttpd.conf") if options.blockstore is None: self.static_content_root = tempfile.mkdtemp(prefix=os.getenv('TEMP', default='/tmp/sw-files-')) else: @@ -109,11 +110,6 @@ def __init__(self, bus, port, options): cherrypy.config.update({"server.thread_pool" : 20}) - - - if options.staticbase is not None: - self.cherrypy_conf["/skyweb"] = { "tools.staticdir.on": True, "tools.staticdir.dir": options.staticbase } - self.subscribe() def subscribe(self):