X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcomm%2Finternal%2FConnectionRecover.cpp;h=a56931afb82c5755c8f07891044b24dff4610237;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=057670fb37a628a80e672484eb447b35c2799dbc;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git diff --git a/source/comm/internal/ConnectionRecover.cpp b/source/comm/internal/ConnectionRecover.cpp index 057670f..a56931a 100644 --- a/source/comm/internal/ConnectionRecover.cpp +++ b/source/comm/internal/ConnectionRecover.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not 'N' Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -53,7 +25,7 @@ using namespace anna; * Se invoca desde el handler::RemoteConnection::finalize y debe estar protegido por la SSCC del Communicator */ void comm::ConnectionRecover::annotateFault(comm::Server* server) -throw() { +{ if(server->autoRecovery() == false) return; @@ -77,7 +49,7 @@ throw() { * Se invoca desde el Communicator y en MT debe estar protegido por la SSCC del Communicator */ void comm::ConnectionRecover::tryRecover() -throw() { +{ LOGMETHOD(TraceMethod traceMethod(Logger::Local7, "comm::ConnectionRecover", "tryRecover", ANNA_FILE_LOCATION)); Millisecond now(functions::millisecond()); @@ -126,14 +98,14 @@ throw() { /* bool comm::ConnectionRecover::contains (comm::Server* server) const - throw () + { Guard guard (a_mutex, "comm::ConnectionRecover::contains"); return std::find (a_breaks.begin (), a_breaks.end (), server) != a_breaks.end (); } void comm::ConnectionRecover::erase (comm::Server* server) - throw () + { Guard guard (a_mutex, "comm::ConnectionRecover::erase"); @@ -151,7 +123,7 @@ void comm::ConnectionRecover::erase (comm::Server* server) */ xml::Node* comm::ConnectionRecover::asXML(xml::Node* parent) const -throw(RuntimeException) { +noexcept(false) { xml::Node* connectionRecover = parent->createChild("comm.ConnectionRecover"); connectionRecover->createAttribute("Active", functions::asString(a_isRunning));