Skip to content

Commit 79cbfd1

Browse files
author
Matt Curtis
committed
Moved FDK logging to debug, and turned debug off by default.
This patch quietens down logging by default, but all FDK logging can still be seen by setting FDK_LOGGING=1.
1 parent 1cb208f commit 79cbfd1

5 files changed

Lines changed: 16 additions & 12 deletions

File tree

fdk/async_http/app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ async def handle_request(self, request, write_callback, stream_callback):
7474

7575
request.uri_template = uri
7676
response = handler(request)
77-
logger.info("got response from function")
77+
logger.debug("got response from function")
7878
res = await response
7979
body = res.body
8080
headers = res.headers

fdk/async_http/protocol.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def keep_alive_timeout_callback(self):
251251
time_left, self.keep_alive_timeout_callback
252252
)
253253
else:
254-
logger.info("KeepAlive Timeout. Closing connection.")
254+
logger.debug("KeepAlive Timeout. Closing connection.")
255255
self.transport.close()
256256
self.transport = None
257257

fdk/async_http/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def start_serving():
203203
def start():
204204
pid = os.getpid()
205205
try:
206-
logger.info("Starting worker [%s]", pid)
206+
logger.debug("Starting worker [%s]", pid)
207207
if constants.is_py37():
208208
loop.run_until_complete(http_server.serve_forever())
209209
else:

fdk/event_handler.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import sys
1919

2020
from fdk import constants
21+
from fdk import log
2122

2223
from fdk.async_http import response
2324

@@ -36,13 +37,13 @@ def event_handle(handle_code):
3637
"""
3738
async def pure_handler(request):
3839
from fdk import runner
39-
logger.info("in pure_handler")
40+
log.log("in pure_handler")
4041
headers = dict(request.headers)
4142
log_frame_header(headers)
4243
func_response = await runner.handle_request(
4344
handle_code, constants.HTTPSTREAM,
4445
headers=headers, data=io.BytesIO(request.body))
45-
logger.info("request execution completed")
46+
log.log("request execution completed")
4647

4748
headers = func_response.context().GetResponseHeaders()
4849
status = func_response.status()

fdk/log.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@
1818

1919

2020
def __setup_logger():
21-
logging.getLogger("asyncio").setLevel(logging.DEBUG)
21+
fdk_debug = os.environ.get("FDK_DEBUG") in [
22+
'true', '1', 't', 'y', 'yes', 'yeah', 'yup', 'certainly', 'uh-huh']
23+
24+
logging.getLogger("asyncio").setLevel(logging.WARNING)
2225
root = logging.getLogger()
23-
root.setLevel(logging.DEBUG)
26+
if fdk_debug:
27+
root.setLevel(logging.DEBUG)
28+
2429
ch = logging.StreamHandler(sys.stderr)
2530
formatter = logging.Formatter(
2631
'%(asctime)s - '
@@ -30,7 +35,8 @@ def __setup_logger():
3035
)
3136
ch.setFormatter(formatter)
3237
root.addHandler(ch)
33-
return root
38+
logger = logging.getLogger("fdk")
39+
return logger
3440

3541

3642
__log__ = __setup_logger()
@@ -41,7 +47,4 @@ def get_logger():
4147

4248

4349
def log(message):
44-
fdk_debug = os.environ.get("FDK_DEBUG")
45-
if fdk_debug in ['true', '1', 't', 'y', 'yes',
46-
'yeah', 'yup', 'certainly', 'uh-huh']:
47-
__log__.info(message)
50+
__log__.debug(message)

0 commit comments

Comments
 (0)