summaryrefslogtreecommitdiff
path: root/cloudinit/patcher.py
diff options
context:
space:
mode:
authorzdc <zdc@users.noreply.github.com>2022-03-26 15:41:59 +0200
committerGitHub <noreply@github.com>2022-03-26 15:41:59 +0200
commitaa60d48c2711cdcd9f88a4e5c77379adb0408231 (patch)
tree349631a02467dae0158f6f663cc8aa8537974a97 /cloudinit/patcher.py
parent5c4b3943343a85fbe517e5ec1fc670b3a8566b4b (diff)
parent31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba (diff)
downloadvyos-cloud-init-aa60d48c2711cdcd9f88a4e5c77379adb0408231.tar.gz
vyos-cloud-init-aa60d48c2711cdcd9f88a4e5c77379adb0408231.zip
Merge pull request #51 from zdc/T2117-sagitta-22.1
T2117: Cloud-init updated to 22.1
Diffstat (limited to 'cloudinit/patcher.py')
-rw-r--r--cloudinit/patcher.py16
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