diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-04-09 01:42:38 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-04-09 01:42:38 +0000 |
| commit | 969764f1dc1b4c95e8ce02dc1f68fc3d924e592e (patch) | |
| tree | 489d290a83aea6cf24e0d407d969e735e048ae54 | |
| parent | f9479455ff74d026206728648d581d4fce282bdf (diff) | |
| download | ATCD-969764f1dc1b4c95e8ce02dc1f68fc3d924e592e.tar.gz | |
Sat Apr 9 01:41:40 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* dance/DomainApplication/Domain_Application_Impl.cpp:
Improved error handling.
* dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
Remove logic that installed error handler interceptors outside of
a localityconfig file.
| -rw-r--r-- | DAnCE/ChangeLog | 11 | ||||
| -rw-r--r-- | DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp | 11 | ||||
| -rw-r--r-- | DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp | 16 |
3 files changed, 22 insertions, 16 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 8c650f2e6f6..2b92a5ebb91 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,14 @@ +Sat Apr 9 01:41:40 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * dance/DomainApplication/Domain_Application_Impl.cpp: + + Improved error handling. + + * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + + Remove logic that installed error handler interceptors outside of + a localityconfig file. + Sat Apr 9 01:41:02 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * dance/Logger/Logger_Service.cpp: diff --git a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp index b961e41a0cf..7d9f8ddaeec 100644 --- a/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp +++ b/DAnCE/dance/DomainApplication/Domain_Application_Impl.cpp @@ -853,6 +853,17 @@ namespace DAnCE this->node_id_.c_str ())); err << "StartError : " << ex.name.in () << "." << ex.reason.in (); } + catch (Deployment::InvalidConnection &ex) + { + DANCE_ERROR (DANCE_LOG_ERROR, + (LM_ERROR, DLINFO + ACE_TEXT("DA_NA_ReplyHandlerImpl::finishLaunch_excep - ") + ACE_TEXT("Plan %C DomainApplication[%@] node %C : InvalidConnection exception caught.\n"), + this->da_servant_->planUUID_.c_str (), + this->da_servant_.in (), + this->node_id_.c_str ())); + err << "InvalidConnection : " << ex.name.in () << "." << ex.reason.in (); + } catch (CORBA::Exception &ex) { DANCE_ERROR (DANCE_LOG_ERROR, diff --git a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp index 2c8ed26f062..409da71174e 100644 --- a/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp +++ b/DAnCE/dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp @@ -84,22 +84,6 @@ namespace DAnCE config.load_from_text_file (ACE_TEXT_CHAR_TO_TCHAR (i->c_str ())); } - if (props && - DAnCE::Utility::get_property_value (DAnCE::LOCALITY_BESTEFFORT, - *props, - tmp)) - { - PLUGIN_MANAGER::instance ()->register_interceptor ( - ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"), - ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Best_Effort")); - } - else - { - PLUGIN_MANAGER::instance ()->register_interceptor ( - ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"), - ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Standard_Error")); - } - if (this->props_) { if (DAnCE::Utility::get_property_value (DAnCE::LOCALITY_TIMEOUT, |