whitespace
This commit is contained in:
parent
b220b8f588
commit
ccf0336c9d
|
@ -206,7 +206,6 @@ void Logger::initialise( const std::string &id, const Options &options ) {
|
|||
if ( tempLevel > INFO ) tempLevel = INFO;
|
||||
} // end if config.log_debug
|
||||
|
||||
|
||||
logFile(tempLogFile);
|
||||
|
||||
terminalLevel(tempTerminalLevel);
|
||||
|
@ -223,13 +222,13 @@ void Logger::initialise( const std::string &id, const Options &options ) {
|
|||
mFlush = true;
|
||||
}
|
||||
|
||||
//mRuntime = (envPtr = getenv( "LOG_RUNTIME")) ? atoi( envPtr ) : false;
|
||||
{
|
||||
struct sigaction action;
|
||||
memset(&action, 0, sizeof(action));
|
||||
action.sa_handler = usrHandler;
|
||||
action.sa_flags = SA_RESTART;
|
||||
|
||||
// Does this REALLY need to be fatal?
|
||||
if ( sigaction(SIGUSR1, &action, 0) < 0 ) {
|
||||
Fatal("sigaction(), error = %s", strerror(errno));
|
||||
}
|
||||
|
@ -264,19 +263,20 @@ void Logger::terminate() {
|
|||
closeDatabase();
|
||||
}
|
||||
|
||||
// These don't belong here, they have nothing to do with logging
|
||||
bool Logger::boolEnv(const std::string &name, bool defaultValue) {
|
||||
const char *envPtr = getenv(name.c_str());
|
||||
return( envPtr ? atoi( envPtr ) : defaultValue );
|
||||
return envPtr ? atoi(envPtr) : defaultValue;
|
||||
}
|
||||
|
||||
int Logger::intEnv(const std::string &name, bool defaultValue) {
|
||||
const char *envPtr = getenv(name.c_str());
|
||||
return( envPtr ? atoi( envPtr ) : defaultValue );
|
||||
return envPtr ? atoi(envPtr) : defaultValue;
|
||||
}
|
||||
|
||||
std::string Logger::strEnv(const std::string &name, const std::string &defaultValue) {
|
||||
const char *envPtr = getenv(name.c_str());
|
||||
return( envPtr ? envPtr : defaultValue );
|
||||
return envPtr ? envPtr : defaultValue;
|
||||
}
|
||||
|
||||
char *Logger::getTargettedEnv(const std::string &name) {
|
||||
|
@ -290,7 +290,7 @@ char *Logger::getTargettedEnv( const std::string &name ) {
|
|||
}
|
||||
if ( !envPtr )
|
||||
envPtr = getenv(name.c_str());
|
||||
return( envPtr );
|
||||
return envPtr;
|
||||
}
|
||||
|
||||
const std::string &Logger::id(const std::string &id) {
|
||||
|
|
Loading…
Reference in New Issue