Skip to content

[AppService] webapp log tail Fix #17987: logging.warning call with invalid 'end' argument #17988

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
qwordy merged 1 commit into from
May 7, 2021
Merged

[AppService] webapp log tail Fix #17987: logging.warning call with invalid 'end' argument #17988

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/azure-cli/azure/cli/command_modules/appservice/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,8 @@ def _get_log(url, user_name, password, log_file=None):
# Extra encode() and decode for stdout which does not surpport 'utf-8'
logger.warning(chunk.decode(encoding='utf-8', errors='replace')
.encode(std_encoding, errors='replace')
.decode(std_encoding, errors='replace'), end='') # each line of log has CRLF.
.decode(std_encoding, errors='replace')
.rstrip('\n\r')) # each line of log has CRLF.
Copy link
Contributor Author

@npazosmendez npazosmendez May 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.rstrip('\n\r') might remove newlines which were intentionally logged by the app, so this is probably not ideal. But I don't know what line terminator is the extra one: \n, \r, \r\n?

From what I've seen, it seems to be \n. So replacing rstrip with [:-1] should do the job, as long as it is guaranteed that there will always be a trailing newline.

r.release_conn()


Expand Down