]>
Commit | Line | Data |
---|---|---|
23102ed6 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
a544966d | 2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
6402d961 TL |
3 | Date: Tue, 10 Mar 2020 12:55:03 +0100 |
4 | Subject: [PATCH 06/32] PVE: [Config] glusterfs: no default logfile if | |
5 | daemonized | |
a544966d | 6 | |
b855dce7 | 7 | Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> |
a544966d WB |
8 | --- |
9 | block/gluster.c | 15 +++++++++++---- | |
10 | 1 file changed, 11 insertions(+), 4 deletions(-) | |
11 | ||
12 | diff --git a/block/gluster.c b/block/gluster.c | |
6402d961 | 13 | index 4fa4a77a47..bfb57ba098 100644 |
a544966d WB |
14 | --- a/block/gluster.c |
15 | +++ b/block/gluster.c | |
be901f66 | 16 | @@ -42,7 +42,7 @@ |
a544966d WB |
17 | #define GLUSTER_DEBUG_DEFAULT 4 |
18 | #define GLUSTER_DEBUG_MAX 9 | |
19 | #define GLUSTER_OPT_LOGFILE "logfile" | |
20 | -#define GLUSTER_LOGFILE_DEFAULT "-" /* handled in libgfapi as /dev/stderr */ | |
21 | +#define GLUSTER_LOGFILE_DEFAULT NULL | |
b855dce7 TL |
22 | /* |
23 | * Several versions of GlusterFS (3.12? -> 6.0.1) fail when the transfer size | |
24 | * is greater or equal to 1024 MiB, so we are limiting the transfer size to 512 | |
be901f66 | 25 | @@ -424,6 +424,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, |
a544966d | 26 | int old_errno; |
6838f038 | 27 | SocketAddressList *server; |
a544966d WB |
28 | unsigned long long port; |
29 | + const char *logfile; | |
30 | ||
31 | glfs = glfs_find_preopened(gconf->volume); | |
32 | if (glfs) { | |
be901f66 | 33 | @@ -466,9 +467,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, |
a544966d WB |
34 | } |
35 | } | |
36 | ||
37 | - ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug); | |
38 | - if (ret < 0) { | |
39 | - goto out; | |
40 | + logfile = gconf->logfile; | |
41 | + if (!logfile && !is_daemonized()) { | |
42 | + logfile = "-"; | |
43 | + } | |
44 | + if (logfile) { | |
45 | + ret = glfs_set_logging(glfs, logfile, gconf->debug); | |
46 | + if (ret < 0) { | |
47 | + goto out; | |
48 | + } | |
49 | } | |
50 | ||
51 | ret = glfs_init(glfs); |