diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-12-10 13:38:00 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-12-10 13:38:00 +0000 |
| commit | 6fe3185e4980744e3b66d602f6d74a56b1e16962 (patch) | |
| tree | 596bd6cf2dfc245112fdb34faa9e4474e0b4e837 | |
| parent | da13c0b043785331011046ac1be9305b25cc14c1 (diff) | |
| download | ATCD-6fe3185e4980744e3b66d602f6d74a56b1e16962.tar.gz | |
ChangeLogTag: Wed Dec 10 13:37:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/Log_Msg.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index 7cdf156c7c1..48dc9c97849 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -804,10 +804,12 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name, ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG); } } - else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER)) + else if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) || + ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG)) { // If we are closing down logger, redirect logging to stderr. ACE_CLR_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER); + ACE_CLR_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG); ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::STDERR); } @@ -2070,6 +2072,7 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record, stderr); if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::CUSTOM) || + ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG) || ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER)) { // Be sure that there is a message_queue_, with multiple threads. @@ -2077,8 +2080,8 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record, } - if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, - ACE_Log_Msg::LOGGER)) + if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::LOGGER) || + ACE_BIT_ENABLED (ACE_Log_Msg::flags_, ACE_Log_Msg::SYSLOG)) { result = ACE_Log_Msg_Manager::log_backend_->log (log_record); |