diff options
| author | zdc <zdc@users.noreply.github.com> | 2022-04-07 20:24:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 20:24:57 +0300 |
| commit | 45c1d42e15f4a5fe5e176e1516b2da9d21e7837a (patch) | |
| tree | 0535c3cf76b60dbf585416b4490c5bd9c9c99359 /cloudinit/patcher.py | |
| parent | 96226f37cdbdaef2fbc51de7b9ca75b61a16792b (diff) | |
| parent | aa60d48c2711cdcd9f88a4e5c77379adb0408231 (diff) | |
| download | vyos-cloud-init-45c1d42e15f4a5fe5e176e1516b2da9d21e7837a.tar.gz vyos-cloud-init-45c1d42e15f4a5fe5e176e1516b2da9d21e7837a.zip | |
Merge pull request #52 from vyos/current
T2117: Backport Cloud-init 22.1 with our changes to VyOS 1.3
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 |