|
a/src/common/rclinit.cpp |
|
b/src/common/rclinit.cpp |
1 |
#ifndef lint
|
1 |
#ifndef lint
|
2 |
static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.7 2006-11-08 07:22:14 dockes Exp $ (C) 2004 J.F.Dockes";
|
2 |
static char rcsid[] = "@(#$Id: rclinit.cpp,v 1.8 2006-11-08 15:34:20 dockes Exp $ (C) 2004 J.F.Dockes";
|
3 |
#endif
|
3 |
#endif
|
4 |
/*
|
4 |
/*
|
5 |
* This program is free software; you can redistribute it and/or modify
|
5 |
* This program is free software; you can redistribute it and/or modify
|
6 |
* it under the terms of the GNU General Public License as published by
|
6 |
* it under the terms of the GNU General Public License as published by
|
7 |
* the Free Software Foundation; either version 2 of the License, or
|
7 |
* the Free Software Foundation; either version 2 of the License, or
|
|
... |
|
... |
66 |
config->getConfParam(string("loglevel"), loglevel);
|
66 |
config->getConfParam(string("loglevel"), loglevel);
|
67 |
|
67 |
|
68 |
// Initialize logging
|
68 |
// Initialize logging
|
69 |
if (!logfilename.empty()) {
|
69 |
if (!logfilename.empty()) {
|
70 |
logfilename = path_tildexpand(logfilename);
|
70 |
logfilename = path_tildexpand(logfilename);
|
71 |
// If not an absolute path, compute relative to config dir
|
71 |
// If not an absolute path or , compute relative to config dir
|
72 |
if (logfilename.at(0) != '/') {
|
72 |
if (logfilename.at(0) != '/' &&
|
|
|
73 |
!DebugLog::DebugLog::isspecialname(logfilename.c_str())) {
|
73 |
logfilename = path_cat(config->getConfDir(), logfilename);
|
74 |
logfilename = path_cat(config->getConfDir(), logfilename);
|
74 |
}
|
75 |
}
|
75 |
DebugLog::setfilename(logfilename.c_str());
|
76 |
DebugLog::setfilename(logfilename.c_str());
|
76 |
}
|
77 |
}
|
77 |
if (!loglevel.empty()) {
|
78 |
if (!loglevel.empty()) {
|