{Core} Reducing the risk of logging file fd leaking

src/azure-cli-core/azure/cli/core/azlogging.py

@@ -29,6 +29,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.util import ensure_dir
 
@@ -46,6 +47,7 @@ def __init__(self, name, cli_ctx=None):
         self.command_logger_handler = None
         self.command_metadata_logger = None
         self.cli_ctx.register_event(EVENT_INVOKER_PRE_CMD_TBL_TRUNCATE, AzCliLogging.init_command_file_logging)
+        self.cli_ctx.register_event(EVENT_CLI_POST_EXECUTE, AzCliLogging.deinit_cmd_metadata_logging)
 
     def get_command_log_dir(self):
         return self.command_log_dir
@@ -173,13 +175,19 @@ def log_cmd_metadata_extension_info(self, extension_name, extension_version):
             self.command_metadata_logger.info("extension name: %s", extension_name)
             self.command_metadata_logger.info("extension version: %s", extension_version)
 
-    def end_cmd_metadata_logging(self, exit_code):
+    @staticmethod
+    def deinit_cmd_metadata_logging(cli_ctx):
+        self = cli_ctx.logging
+        self.end_cmd_metadata_logging(cli_ctx.result.exit_code if cli_ctx.result else 128)
+
+    def end_cmd_metadata_logging(self, exit_code):  # leave it non '-' prefix to not to break user
         if self.command_metadata_logger:
             self.command_metadata_logger.info("exit code: %s", exit_code)
 
             # We have finished metadata logging, remove handler and set command_metadata_handler to None.
             # crucial to remove handler as in python logger objects are shared which can affect testing of this logger
             # we do not want duplicate handlers to be added in subsequent calls of _init_command_logfile_handlers
+            self.command_logger_handler.close()
             self.command_metadata_logger.removeHandler(self.command_logger_handler)
             self.command_metadata_logger = None
 

src/azure-cli-core/azure/cli/core/util.py

@@ -93,6 +93,8 @@ def handle_exception(ex):  # pylint: disable=too-many-return-statements
             except (ValueError, KeyError):
                 logger.error(ex)
             return 1
+        if isinstance(ex, SystemExit):
+            return ex.code
 
         logger.error("The command failed with an unexpected error. Here is the traceback:\n")
         logger.exception(ex)

src/azure-cli-testsdk/azure/cli/testsdk/base.py

@@ -133,6 +133,7 @@ def _merge_lists(base, patches):
     def tearDown(self):
         for processor in self._processors_to_reset:
             processor.reset()
+
         super(ScenarioTest, self).tearDown()
 
     def create_random_name(self, prefix, length):

src/azure-cli/azure/cli/__main__.py

@@ -47,7 +47,6 @@ def cli_main(cli, args):
 
     elapsed_time = timeit.default_timer() - start_time
 
-    az_cli.logging.end_cmd_metadata_logging(exit_code)
     sys.exit(exit_code)
 
 except KeyboardInterrupt:
@@ -61,7 +60,6 @@ def cli_main(cli, args):
     except NameError:
         pass
 
-    az_cli.logging.end_cmd_metadata_logging(exit_code)
     raise ex
 
 finally:

src/azure-cli/azure/cli/command_modules/aro/tests/__init__.py

@@ -0,0 +1,4 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------

src/azure-cli/azure/cli/command_modules/aro/tests/latest/__init__.py

@@ -0,0 +1,4 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------