Skip to content

Commit 1db7fd1

Browse files
committed
remove cherrypy imports, fix logging
1 parent 4a30461 commit 1db7fd1

File tree

4 files changed

+4
-25
lines changed

4 files changed

+4
-25
lines changed

src/pyff/api.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -487,24 +487,11 @@ def cors_headers(request: Request, response: Response) -> None:
487487
event.request.add_response_callback(cors_headers)
488488

489489

490-
def launch_memory_usage_server(port: int = 9002) -> None:
491-
import cherrypy
492-
import dowser
493-
494-
cherrypy.tree.mount(dowser.Root())
495-
cherrypy.config.update({'environment': 'embedded', 'server.socket_port': port})
496-
497-
cherrypy.engine.start()
498-
499-
500490
def mkapp(*args: Any, **kwargs: Any) -> Any:
501491
md = kwargs.pop('md', None)
502492
if md is None:
503493
md = MDRepository()
504494

505-
if config.devel_memory_profile:
506-
launch_memory_usage_server()
507-
508495
with Configurator(debug_logger=log) as ctx:
509496
ctx.add_subscriber(add_cors_headers_response_callback, NewRequest)
510497

src/pyff/constants.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ class Config(object):
264264
allow_shutdown = S("allow_shutdown", default=False, typeconv=as_bool, deprecated=True)
265265
ds_template = S("ds_template", default="ds.html", deprecated=True)
266266

267-
loglevel = S("loglevel", default=logging.WARN, info="set the loglevel")
267+
loglevel = S("loglevel", default='WARN', info="set the loglevel")
268268

269269
access_log = S("access_log", cmdline=['pyffd'], info="a log target (file) to use for access logs")
270270

@@ -523,7 +523,7 @@ def parse_options(program, docs):
523523
sys.exit(2)
524524

525525
if config.loglevel is None:
526-
config.loglevel = logging.INFO
526+
config.loglevel = 'INFO'
527527

528528
if config.aliases is None or len(config.aliases) == 0:
529529
config.aliases = dict(metadata=entities)

src/pyff/fetch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def schedule(self, url):
9696
:param url: the url to fetch
9797
:return: nothing is returned.
9898
"""
99-
log.debug("scheduling fetch of {}".format(url))
99+
log.info("scheduling fetch of {}".format(url))
100100
self.request.put(url)
101101

102102
def stop(self):

src/pyff/logs.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@
77

88
import six
99

10-
try:
11-
import cherrypy
12-
except ImportError as e:
13-
logging.debug("cherrypy logging disabled")
14-
cherrypy = None
15-
1610

1711
class PyFFLogger(object):
1812
def __init__(self, name=None):
@@ -29,9 +23,7 @@ def __init__(self, name=None):
2923
}
3024

3125
def _l(self, severity, msg):
32-
if cherrypy is not None and '' in cherrypy.tree.apps:
33-
cherrypy.tree.apps[''].log(str(msg), severity=severity)
34-
elif severity in self._loggers:
26+
if severity in self._loggers:
3527
self._loggers[severity](str(msg))
3628
else:
3729
raise ValueError("unknown severity %s" % severity)

0 commit comments

Comments
 (0)