|
a/src/common/rclinit.cpp |
|
b/src/common/rclinit.cpp |
|
... |
|
... |
| 246 |
}
|
246 |
}
|
| 247 |
}
|
247 |
}
|
| 248 |
|
248 |
|
| 249 |
#endif
|
249 |
#endif
|
| 250 |
|
250 |
|
| 251 |
RclConfig *recollinit(RclInitFlags flags,
|
251 |
RclConfig *recollinit(int flags,
|
| 252 |
void (*cleanup)(void), void (*sigcleanup)(int),
|
252 |
void (*cleanup)(void), void (*sigcleanup)(int),
|
| 253 |
string &reason, const string *argcnf)
|
253 |
string &reason, const string *argcnf)
|
| 254 |
{
|
254 |
{
|
| 255 |
if (cleanup)
|
255 |
if (cleanup)
|
| 256 |
atexit(cleanup);
|
256 |
atexit(cleanup);
|
|
... |
|
... |
| 279 |
string logfilename, loglevel;
|
279 |
string logfilename, loglevel;
|
| 280 |
if (flags & RCLINIT_DAEMON) {
|
280 |
if (flags & RCLINIT_DAEMON) {
|
| 281 |
config->getConfParam(string("daemlogfilename"), logfilename);
|
281 |
config->getConfParam(string("daemlogfilename"), logfilename);
|
| 282 |
config->getConfParam(string("daemloglevel"), loglevel);
|
282 |
config->getConfParam(string("daemloglevel"), loglevel);
|
| 283 |
}
|
283 |
}
|
| 284 |
if ((flags & RCLINIT_IDX) && logfilename.empty())
|
284 |
if (flags & RCLINIT_IDX) {
|
|
|
285 |
if (logfilename.empty()) {
|
| 285 |
config->getConfParam(string("idxlogfilename"), logfilename);
|
286 |
config->getConfParam(string("idxlogfilename"), logfilename);
|
| 286 |
if ((flags & RCLINIT_IDX) && loglevel.empty())
|
287 |
}
|
|
|
288 |
if (loglevel.empty()) {
|
| 287 |
config->getConfParam(string("idxloglevel"), loglevel);
|
289 |
config->getConfParam(string("idxloglevel"), loglevel);
|
|
|
290 |
}
|
|
|
291 |
}
|
| 288 |
|
292 |
|
| 289 |
if (logfilename.empty())
|
293 |
if (logfilename.empty())
|
| 290 |
config->getConfParam(string("logfilename"), logfilename);
|
294 |
config->getConfParam(string("logfilename"), logfilename);
|
| 291 |
if (loglevel.empty())
|
295 |
if (loglevel.empty())
|
| 292 |
config->getConfParam(string("loglevel"), loglevel);
|
296 |
config->getConfParam(string("loglevel"), loglevel);
|