debian/patches/pve/0044-glusterfs-no-default-logfile-if-daemonized.patch

   1 From 77846c1104d083aa09194b415b367d1b7021e4ee Mon Sep 17 00:00:00 2001
   2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
   3 Date: Mon, 24 Oct 2016 09:32:36 +0200
   4 Subject: [PATCH 44/47] glusterfs: no default logfile if daemonized
   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
  11 index a577dae..e712dc7 100644
  12 --- a/block/gluster.c
  13 +++ b/block/gluster.c
  14 @@ -33,7 +33,7 @@
  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
  23 @@ -398,6 +398,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
  24      int old_errno;
  25      SocketAddressFlatList *server;
  26      unsigned long long port;
  27 +    const char *logfile;
  28
  29      glfs = glfs_find_preopened(gconf->volume);
  30      if (glfs) {
  31 @@ -433,9 +434,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
  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 --
  51 2.1.4
  52