Skip to content

Commit 926bfae

Browse files
author
Bob Bui
committedOct 16, 2020
re fix #61 Using root logger + flask outside of flask request context throws RuntimeError
1 parent d9171fa commit 926bfae

File tree

5 files changed

+32
-11
lines changed

5 files changed

+32
-11
lines changed
 

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55
The format is based on [Keep a Changelog](http://keepachangelog.com/).
66

7-
## 1.2.8 - 2020-10-15
7+
## 1.2.10 - 2020-10-15
8+
- re fix #61 Using root logger + flask outside of flask request context throws RuntimeError
9+
10+
## 1.2.9 - 2020-10-15
811
- Fix #61 Using root logger + flask outside of flask request context throws RuntimeError
912

1013
## 1.2.8 - 2020-08-27

‎json_logging/framework/connexion/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,18 @@ def get_remote_user(self, request):
8282
return json_logging.EMPTY_VALUE
8383

8484
def get_http_header(self, request, header_name, default=None):
85-
if header_name in request.headers:
86-
return request.headers.get(header_name)
85+
try:
86+
if header_name in request.headers:
87+
return request.headers.get(header_name)
88+
except:
89+
pass
8790
return default
8891

8992
def set_correlation_id(self, request_, value):
90-
_connexion.g.correlation_id = value
93+
try:
94+
_connexion.g.correlation_id = value
95+
except:
96+
pass
9197

9298
def get_correlation_id_in_request_context(self, request):
9399
try:

‎json_logging/framework/flask/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,18 @@ def get_remote_user(self, request):
7878
return json_logging.EMPTY_VALUE
7979

8080
def get_http_header(self, request, header_name, default=None):
81-
if header_name in request.headers:
82-
return request.headers.get(header_name)
81+
try:
82+
if header_name in request.headers:
83+
return request.headers.get(header_name)
84+
except:
85+
pass
8386
return default
8487

8588
def set_correlation_id(self, request_, value):
86-
_flask.g.correlation_id = value
89+
try:
90+
_flask.g.correlation_id = value
91+
except:
92+
pass
8793

8894
def get_correlation_id_in_request_context(self, request):
8995
try:

‎json_logging/framework/quart/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,18 @@ def get_remote_user(self, request):
8383
return json_logging.EMPTY_VALUE
8484

8585
def get_http_header(self, request, header_name, default=None):
86-
if header_name in request.headers:
87-
return request.headers.get(header_name)
86+
try:
87+
if header_name in request.headers:
88+
return request.headers.get(header_name)
89+
except:
90+
pass
8891
return default
8992

9093
def set_correlation_id(self, request_, value):
91-
_quart.g.correlation_id = value
94+
try:
95+
_quart.g.correlation_id = value
96+
except:
97+
pass
9298

9399
def get_correlation_id_in_request_context(self, request):
94100
try:

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
setup(
1414
name="json-logging",
15-
version='1.2.9',
15+
version='1.2.10',
1616
packages=find_packages(exclude=['contrib', 'docs', 'tests*', 'example', 'dist', 'build']),
1717
license='Apache License 2.0',
1818
description="JSON Python Logging",

0 commit comments

Comments
 (0)