Skip to content

Set content-length to 0 in logging messages when return value is a Generator #4723

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

Merged
arm4b merged 5 commits into from
Jul 11, 2019
Merged

Set content-length to 0 in logging messages when return value is a Generator #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8af82c
Set content-length to 0 in logging messages when returnvalue is a Gen…
nmaludy Jun 25, 2019
6d709b5
Added changelog message for content_length update
nmaludy Jun 25, 2019
910b25d
Merge branch 'master' into bugfix/4722-content-length-infinity
nmaludy Jul 1, 2019
9c58038
Merge branch 'master' into bugfix/4722-content-length-infinity
armab Jul 11, 2019
760eeb1
Merge branch 'master' into bugfix/4722-content-length-infinity
armab Jul 11, 2019
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
7 changes: 6 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ in development
Fixed
~~~~~

* Fixed logging middleware to output a ``content_length`` of ``0`` instead of ``Infinity``
when the type of data being returned is not supported. Previously, when the value was
set to ``Infinity`` this would result in invalid JSON being output into structured
logs. (bug fix) #4722

Contributed by Nick Maludy (@nmaludy Encore Technologies)
* Fix the workflow execution cancelation to proceed even if the workflow execution is not found or
completed. (bug fix) #4735


3.1.0 - June 27, 2019
---------------------

Expand Down
2 changes: 1 addition & 1 deletion st2common/st2common/middleware/logging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def custom_start_response(status, headers, exc_info=None):
if isinstance(retval, (types.GeneratorType, itertools.chain)):
# Note: We don't log the result when return value is a generator, because this would
# result in calling str() on the generator and as such, exhausting it
content_length = [float('inf')]
content_length = [0]
log_result = False

# Log the response
Expand Down