diff options
| author | msmit <msmit@remedy.nl> | 2010-08-04 12:24:33 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-08-04 12:24:33 +0000 |
| commit | a3aa97b1e67a1f9d339219b3072eae7d818dd996 (patch) | |
| tree | a257a3c345993e68eacdc623c990fe9688ac514d | |
| parent | 736398bd702f7d656846a7800184ab949f5f0139 (diff) | |
| download | ATCD-a3aa97b1e67a1f9d339219b3072eae7d818dd996.tar.gz | |
Wed Aug 4 12:21:58 UTC 2010 Marcel Smit <msmit@remedy.nl>
* tao/SystemException.cpp:
Added TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING define. When set,
no newline character will occur in the exception logging and therefor
all logging will appear on one line.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/SystemException.cpp | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5a8e24d4471..718233ece7f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 4 12:21:58 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * tao/SystemException.cpp: + Added TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING define. When set, + no newline character will occur in the exception logging and therefor + all logging will appear on one line. + Wed Aug 4 08:41:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/ImplRepo_Service/Locator_Repository.cpp: diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 664a37bd255..8cf80decb90 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -238,7 +238,11 @@ CORBA::SystemException::_info (void) const ACE_CString info = "system exception, ID '"; info += this->_rep_id (); +#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) + info += "'; "; +#else info += "'\n"; +#endif CORBA::ULong const VMCID = this->minor () & 0xFFFFF000u; @@ -395,7 +399,11 @@ CORBA::SystemException::_info (void) const ACE_OS::sprintf (buffer, "TAO exception, " "minor code = %x (%s; %s), " +#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) + "completed = %s; ", +#else "completed = %s\n", +#endif minor_code, location, errno_indication, @@ -424,7 +432,11 @@ CORBA::SystemException::_info (void) const ACE_OS::sprintf (buffer, "OMG minor code (%d), " "described as '%s', " +#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) + "completed = %s; ", +#else "completed = %s\n", +#endif minor_code, minor_description, (completed () == CORBA::COMPLETED_YES) ? "YES" : @@ -439,7 +451,11 @@ CORBA::SystemException::_info (void) const char buffer[BUFSIZ]; ACE_OS::sprintf (buffer, "Unknown vendor minor code id (%x), " +#if defined (TAO_SKIP_NEW_LINE_IN_EXCEPTION_LOGGING) + "minor code = %x, completed = %s; ", +#else "minor code = %x, completed = %s\n", +#endif VMCID, this->minor (), // Use the raw minor code (completed () == CORBA::COMPLETED_YES) ? "YES" : |