From 9481bc1ab448616d0ab763a22a8137c75ce4edfd Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 13 Apr 2018 14:31:33 +0200
Subject: [PATCH] indexing log: fix idx/daemlogfilename not working as expected

---
 src/common/rclinit.cpp    | 14 +++++++++-----
 src/common/rclinit.h      |  2 +-
 src/index/recollindex.cpp |  6 ++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/common/rclinit.cpp b/src/common/rclinit.cpp
index 7fc7c5f0..070be98f 100644
--- a/src/common/rclinit.cpp
+++ b/src/common/rclinit.cpp
@@ -248,7 +248,7 @@ void recoll_exitready()
 
 #endif
 
-RclConfig *recollinit(RclInitFlags flags, 
+RclConfig *recollinit(int flags, 
 		      void (*cleanup)(void), void (*sigcleanup)(int), 
 		      string &reason, const string *argcnf)
 {
@@ -281,10 +281,14 @@ RclConfig *recollinit(RclInitFlags flags,
 	config->getConfParam(string("daemlogfilename"), logfilename);
 	config->getConfParam(string("daemloglevel"), loglevel);
     }
-    if ((flags & RCLINIT_IDX) && logfilename.empty())
-	config->getConfParam(string("idxlogfilename"), logfilename);
-    if ((flags & RCLINIT_IDX) && loglevel.empty()) 
-	config->getConfParam(string("idxloglevel"), loglevel);
+    if (flags & RCLINIT_IDX) {
+        if (logfilename.empty()) {
+            config->getConfParam(string("idxlogfilename"), logfilename);
+        }
+        if (loglevel.empty()) {
+            config->getConfParam(string("idxloglevel"), loglevel);
+        }
+    }
 
     if (logfilename.empty())
 	config->getConfParam(string("logfilename"), logfilename);
diff --git a/src/common/rclinit.h b/src/common/rclinit.h
index 470da903..490358b3 100644
--- a/src/common/rclinit.h
+++ b/src/common/rclinit.h
@@ -40,7 +40,7 @@ class RclConfig;
  * @return the parsed configuration.
  */
 enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2};
-extern RclConfig *recollinit(RclInitFlags flags,
+extern RclConfig *recollinit(int flags,
                              void (*cleanup)(void), void (*sigcleanup)(int),
                              std::string& reason, const string *argcnf = 0);
 inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
diff --git a/src/index/recollindex.cpp b/src/index/recollindex.cpp
index 7258274c..8b01525e 100644
--- a/src/index/recollindex.cpp
+++ b/src/index/recollindex.cpp
@@ -624,8 +624,10 @@ int main(int argc, char **argv)
     }
 
     string reason;
-    RclInitFlags flags = (op_flags & OPT_m) && !(op_flags&OPT_D) ? 
-	RCLINIT_DAEMON : RCLINIT_IDX;
+    int flags = RCLINIT_IDX;
+    if ((op_flags & OPT_m) && !(op_flags&OPT_D)) {
+	flags |= RCLINIT_DAEMON;
+    }
     config = recollinit(flags, cleanup, sigcleanup, reason, &a_config);
     if (config == 0 || !config->ok()) {
         addIdxReason("init", reason);