Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update GCF Python 3.7 backwards-compatible logging #131

Merged
merged 2 commits into from
Jun 1, 2021
Merged

Update GCF Python 3.7 backwards-compatible logging #131

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314d8f0
Fix logging monkeypatching
asriniva May 27, 2021
6162565
Add logging exception test
asriniva Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/functions_framework/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import importlib.util
import io
import json
import logging
import os.path
import pathlib
import sys
Expand Down Expand Up @@ -62,6 +63,18 @@ def write(self, out):
return self.stderr.write(json.dumps(payload) + "\n")


def setup_logging():
logging.getLogger().setLevel(logging.INFO)
info_handler = logging.StreamHandler(sys.stdout)
info_handler.setLevel(logging.NOTSET)
info_handler.addFilter(lambda record: record.levelno <= logging.INFO)
logging.getLogger().addHandler(info_handler)

warn_handler = logging.StreamHandler(sys.stderr)
warn_handler.setLevel(logging.WARNING)
logging.getLogger().addHandler(warn_handler)


def _http_view_func_wrapper(function, request):
def view_func(path):
return function(request._get_current_object())
Expand Down Expand Up @@ -237,15 +250,9 @@ def handle_none(rv):
app.make_response = handle_none

# Handle log severity backwards compatibility
import logging # isort:skip

logging.info = _LoggingHandler("INFO", sys.stderr).write
logging.warn = _LoggingHandler("ERROR", sys.stderr).write
logging.warning = _LoggingHandler("ERROR", sys.stderr).write
logging.error = _LoggingHandler("ERROR", sys.stderr).write
logging.critical = _LoggingHandler("ERROR", sys.stderr).write
sys.stdout = _LoggingHandler("INFO", sys.stderr)
sys.stderr = _LoggingHandler("ERROR", sys.stderr)
setup_logging()

# Extract the target function from the source file
if not hasattr(source_module, target):
Expand Down