43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From da1255cdb68ab33a90136ebbec2fa0fda034f6a2 Mon Sep 17 00:00:00 2001
|
|
From: Tony Asleson <tasleson@redhat.com>
|
|
Date: Thu, 30 Mar 2023 10:07:13 -0500
|
|
Subject: [PATCH 2/3] lvmdbusd: Correct locking for _common_log
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reduce the lock time and include the flush in the lock.
|
|
|
|
Reported by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
|
|
---
|
|
daemons/lvmdbusd/utils.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py
|
|
index 6013b656f..fdd7578c1 100644
|
|
--- a/daemons/lvmdbusd/utils.py
|
|
+++ b/daemons/lvmdbusd/utils.py
|
|
@@ -323,16 +323,17 @@ def _format_log_entry(msg):
|
|
|
|
|
|
def _common_log(msg, *attributes):
|
|
- cfg.stdout_lock.acquire()
|
|
msg = _format_log_entry(msg)
|
|
|
|
+ cfg.stdout_lock.acquire()
|
|
+
|
|
if STDOUT_TTY and attributes:
|
|
print(color(msg, *attributes))
|
|
else:
|
|
print(msg)
|
|
|
|
- cfg.stdout_lock.release()
|
|
sys.stdout.flush()
|
|
+ cfg.stdout_lock.release()
|
|
|
|
|
|
# Serializes access to stdout to prevent interleaved output
|
|
--
|
|
2.39.2
|
|
|