diff options
| author | zsdc <taras@vyos.io> | 2022-03-25 20:58:01 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2022-03-25 21:42:00 +0200 |
| commit | 31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba (patch) | |
| tree | 349631a02467dae0158f6f663cc8aa8537974a97 /cloudinit/patcher.py | |
| parent | 5c4b3943343a85fbe517e5ec1fc670b3a8566b4b (diff) | |
| parent | 8537237d80a48c8f0cbf8e66aa4826bbc882b022 (diff) | |
| download | vyos-cloud-init-31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba.tar.gz vyos-cloud-init-31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba.zip | |
T2117: Cloud-init updated to 22.1
Merged with 22.1 tag from the upstream Cloud-init repository.
Our modules were slightly modified for compatibility with the new
version.
Diffstat (limited to 'cloudinit/patcher.py')
| -rw-r--r-- | cloudinit/patcher.py | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/cloudinit/patcher.py b/cloudinit/patcher.py index 2df9441a..516be22c 100644 --- a/cloudinit/patcher.py +++ b/cloudinit/patcher.py @@ -6,13 +6,13 @@ # # This file is part of cloud-init. See LICENSE file for license information. -import imp import logging import sys # Default fallback format -FALL_FORMAT = ('FALLBACK: %(asctime)s - %(filename)s[%(levelname)s]: ' + - '%(message)s') +FALL_FORMAT = ( + "FALLBACK: %(asctime)s - %(filename)s[%(levelname)s]: " + "%(message)s" +) class QuietStreamHandler(logging.StreamHandler): @@ -20,7 +20,7 @@ class QuietStreamHandler(logging.StreamHandler): pass -def _patch_logging(): +def patch_logging(): # Replace 'handleError' with one that will be more # tolerant of errors in that it can avoid # re-notifying on exceptions and when errors @@ -35,14 +35,8 @@ def _patch_logging(): fallback_handler.flush() except IOError: pass - setattr(logging.Handler, 'handleError', handleError) + setattr(logging.Handler, "handleError", handleError) -def patch(): - imp.acquire_lock() - try: - _patch_logging() - finally: - imp.release_lock() # vi: ts=4 expandtab |