summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2015-10-13 15:31:57 +0100
committerAlasdair G Kergon <agk@redhat.com>2015-10-13 15:31:57 +0100
commit0cf787a377548394f4588b671c2890ee1a45098b (patch)
tree8597fefde6f83e806f7903f672d181f3923d3a35
parentacc70de43968961e9a71612cda04642e4fbfd71f (diff)
downloadlvm2-0cf787a377548394f4588b671c2890ee1a45098b.tar.gz
Revert "log: no file for external logging"
This reverts commit 1b1c01a27b359f8e91c3c9e08684c435d8fd51c2. This caused messages to get dropped instead of logged into the log file. (The log file and log function are independent at the moment.)
-rw-r--r--WHATS_NEW1
-rw-r--r--lib/log/log.c4
2 files changed, 0 insertions, 5 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 7507b9cf6..c089228e8 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,5 @@
Version 2.02.133 -
======================================
- Avoid creation of log file when logging function is set.
Do not change logging in lvm2 library when it's already set.
Check for enough space in thin-pool in command before creating new thin.
Make libblkid detect all copies of the same signature if use_blkid_wiping=1.
diff --git a/lib/log/log.c b/lib/log/log.c
index 2f1be725b..c44c3d416 100644
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -71,10 +71,6 @@ void init_log_file(const char *log_file, int append)
int i = 0;
_log_file_path[0] = '\0';
-
- if (_lvm2_log_fn)
- return; /* No log file, when log function is set */
-
if ((env = getenv("LVM_LOG_FILE_EPOCH"))) {
while (isalpha(env[i]) && i < 32) /* Up to 32 alphas */
i++;