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

fix pb with special log file names

Browse Source
This commit is contained in:
dockes 2006-11-08 15:34:20 +00:00
parent 4ebed2e817
commit df7b8711a1
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/rclinit.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.7 2006-11-08 07:22:14 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.8 2006-11-08 15:34:20 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -68,8 +68,9 @@ RclConfig *recollinit(RclInitFlags flags,
// Initialize logging // Initialize logging
if (!logfilename.empty()) { if (!logfilename.empty()) {
logfilename = path_tildexpand(logfilename); logfilename = path_tildexpand(logfilename);
// If not an absolute path, compute relative to config dir // If not an absolute path or , compute relative to config dir
if (logfilename.at(0) != '/') { if (logfilename.at(0) != '/' &&
!DebugLog::DebugLog::isspecialname(logfilename.c_str())) {
logfilename = path_cat(config->getConfDir(), logfilename); logfilename = path_cat(config->getConfDir(), logfilename);
} }
DebugLog::setfilename(logfilename.c_str()); DebugLog::setfilename(logfilename.c_str());

7
src/utils/debuglog.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.3 2006-01-23 13:32:28 dockes Exp $ (C) 2002 OKYZ"; static char rcsid [] = "@(#$Id: debuglog.cpp,v 1.4 2006-11-08 15:34:20 dockes Exp $ (C) 2002 OKYZ";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -43,6 +43,11 @@ namespace DebugLog {
#endif // NO_NAMESPACES #endif // NO_NAMESPACES
bool DebugLog::isspecialname(const char *logname)
{
return !strcmp(logname, "stdout") || !strcmp(logname, "stderr");
}
class DebugLogWriter { class DebugLogWriter {
public: public:
virtual ~DebugLogWriter() {} virtual ~DebugLogWriter() {}

1
src/utils/debuglog.h
View File

@ -61,6 +61,7 @@ class DebugLog {
virtual void pushlevel(int lev); virtual void pushlevel(int lev);
virtual void poplevel(); virtual void poplevel();
virtual void logdate(int onoff) {dodate = onoff;} virtual void logdate(int onoff) {dodate = onoff;}
static bool isspecialname(const char *logname);
}; };
extern DebugLog *getdbl(); extern DebugLog *getdbl();