]>
Commit | Line | Data |
---|---|---|
23102ed6 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
a544966d WB |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
3 | Date: Mon, 24 Oct 2016 09:32:36 +0200 | |
23102ed6 | 4 | Subject: [PATCH] glusterfs: no default logfile if daemonized |
a544966d WB |
5 | |
6 | --- | |
7 | block/gluster.c | 15 +++++++++++---- | |
8 | 1 file changed, 11 insertions(+), 4 deletions(-) | |
9 | ||
10 | diff --git a/block/gluster.c b/block/gluster.c | |
9b05d1d4 | 11 | index d09f4f2283..4e398af5c1 100644 |
a544966d WB |
12 | --- a/block/gluster.c |
13 | +++ b/block/gluster.c | |
6838f038 | 14 | @@ -32,7 +32,7 @@ |
a544966d WB |
15 | #define GLUSTER_DEBUG_DEFAULT 4 |
16 | #define GLUSTER_DEBUG_MAX 9 | |
17 | #define GLUSTER_OPT_LOGFILE "logfile" | |
18 | -#define GLUSTER_LOGFILE_DEFAULT "-" /* handled in libgfapi as /dev/stderr */ | |
19 | +#define GLUSTER_LOGFILE_DEFAULT NULL | |
20 | ||
21 | #define GERR_INDEX_HINT "hint: check in 'server' array index '%d'\n" | |
22 | ||
9b05d1d4 | 23 | @@ -401,6 +401,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, |
a544966d | 24 | int old_errno; |
6838f038 | 25 | SocketAddressList *server; |
a544966d WB |
26 | unsigned long long port; |
27 | + const char *logfile; | |
28 | ||
29 | glfs = glfs_find_preopened(gconf->volume); | |
30 | if (glfs) { | |
9b05d1d4 | 31 | @@ -443,9 +444,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf, |
a544966d WB |
32 | } |
33 | } | |
34 | ||
35 | - ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug); | |
36 | - if (ret < 0) { | |
37 | - goto out; | |
38 | + logfile = gconf->logfile; | |
39 | + if (!logfile && !is_daemonized()) { | |
40 | + logfile = "-"; | |
41 | + } | |
42 | + if (logfile) { | |
43 | + ret = glfs_set_logging(glfs, logfile, gconf->debug); | |
44 | + if (ret < 0) { | |
45 | + goto out; | |
46 | + } | |
47 | } | |
48 | ||
49 | ret = glfs_init(glfs); | |
50 | -- | |
45169293 | 51 | 2.11.0 |
a544966d | 52 |