tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add pylogfilename and pyloglevel functions to allow separating python logging. Unify recollinit calls

Browse Source
This commit is contained in:
Jean-Francois Dockes
2019-03-10 14:52:46 +01:00
parent 3b55d03b39
commit 20910d3911
9 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/rclinit.cpp
+13 -3
View File
@@ -274,7 +274,8 @@ RclConfig *recollinit(int flags,
// to utf8 for indexing.
setlocale(LC_CTYPE, "");
Logger::getTheLog("")->setLogLevel(Logger::LLDEB1);
// Initially log to stderr, at error level.
Logger::getTheLog("")->setLogLevel(Logger::LLERR);
initAsyncSigs(sigcleanup);
@@ -306,6 +307,14 @@ RclConfig *recollinit(int flags,
config->getConfParam(string("idxloglevel"), loglevel);
}
}
if (flags & RCLINIT_PYTHON) {
if (logfilename.empty()) {
config->getConfParam(string("pylogfilename"), logfilename);
}
if (loglevel.empty()) {
config->getConfParam(string("pyloglevel"), loglevel);
}
}
if (logfilename.empty())
config->getConfParam(string("logfilename"), logfilename);
@@ -315,7 +324,7 @@ RclConfig *recollinit(int flags,
// Initialize logging
if (!logfilename.empty()) {
logfilename = path_tildexpand(logfilename);
// If not an absolute path or , compute relative to config dir
// If not an absolute path or stderr, compute relative to config dir.
if (!path_isabsolute(logfilename) &&
logfilename.compare("stderr")) {
logfilename = path_cat(config->getConfDir(), logfilename);
@@ -372,7 +381,8 @@ RclConfig *recollinit(int flags,
int flushmb;
if (config->getConfParam("idxflushmb", &flushmb) && flushmb > 0) {
LOGDEB1("rclinit: idxflushmb=" << (flushmb) << ", set XAPIAN_FLUSH_THRESHOLD to 10E6\n" );
LOGDEB1("rclinit: idxflushmb=" << flushmb <<
", set XAPIAN_FLUSH_THRESHOLD to 10E6\n");
static const char *cp = "XAPIAN_FLUSH_THRESHOLD=1000000";
#ifdef PUTENV_ARG_CONST
::putenv(cp);
src/common/rclinit.h
+2 -7
View File
@@ -39,16 +39,11 @@ class RclConfig;
* default and environment
* @return the parsed configuration.
*/
enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2};
enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2,
RCLINIT_PYTHON = 4};
extern RclConfig *recollinit(int flags,
void (*cleanup)(void), void (*sigcleanup)(int),
std::string& reason, const std::string *argcnf = 0);
inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
std::string& reason,
const std::string *argcnf = 0)
{
return recollinit(RCLINIT_NONE, cleanup, sigcleanup, reason, argcnf);
}
// Threads need to call this to block signals.
// The main thread handles all signals.