Skip to content

{Core} Always use UTF-8 for command metadata log file encoding #17996

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
jiasli merged 2 commits into from
May 8, 2021
Merged

{Core} Always use UTF-8 for command metadata log file encoding #17996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f21cdb
use UTF-8
jiasli May 7, 2021
2534674
bump knack version
jiasli May 7, 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
4 changes: 2 additions & 2 deletions src/azure-cli-core/azure/cli/core/azlogging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from azure.cli.core.commands.events import EVENT_INVOKER_PRE_CMD_TBL_TRUNCATE

from knack.events import EVENT_CLI_POST_EXECUTE
from knack.log import CLILogging, get_logger
from knack.log import CLILogging, get_logger, LOG_FILE_ENCODING
from knack.util import ensure_dir


Expand Down Expand Up @@ -112,7 +112,7 @@ def _init_command_logfile_handlers(self, command_metadata_logger, args):
log_file_path = os.path.join(self.command_log_dir, log_name)
get_logger(__name__).debug("metadata file logging enabled - writing logs to '%s'.", log_file_path)

logfile_handler = logging.FileHandler(log_file_path)
logfile_handler = logging.FileHandler(log_file_path, encoding=LOG_FILE_ENCODING)

lfmt = logging.Formatter(_CMD_LOG_LINE_PREFIX + ' %(process)d | %(asctime)s | %(levelname)s | %(name)s | %(message)s') # pylint: disable=line-too-long
logfile_handler.setFormatter(lfmt)
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli-core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
'cryptography>=3.2,<3.4',
'humanfriendly>=4.7,<10.0',
'jmespath',
'knack~=0.8.1',
'knack~=0.8.2',
'msal>=1.10.0,<2.0.0',
# Dependencies of the vendored subscription SDK
# https://github.com/Azure/azure-sdk-for-python/blob/ab12b048ddf676fe0ccec16b2167117f0609700d/sdk/resources/azure-mgmt-resource/setup.py#L82-L86
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ isodate==0.6.0
Jinja2==2.11.3
jmespath==0.9.5
jsmin==2.2.2
knack==0.8.1
knack==0.8.2
MarkupSafe==1.1.1
mock==4.0.2
msal==1.10.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ isodate==0.6.0
Jinja2==2.11.3
jmespath==0.9.5
jsmin==2.2.2
knack==0.8.1
knack==0.8.2
MarkupSafe==1.1.1
mock==4.0.2
msal==1.10.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ isodate==0.6.0
Jinja2==2.11.3
jmespath==0.9.5
jsmin==2.2.2
knack==0.8.1
knack==0.8.2
MarkupSafe==1.1.1
mock==4.0.2
msal==1.10.0
Expand Down