Merge remote-tracking branch 'origin/3.7' into swift

1 files changed, 5 insertions, 11 deletions

diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index ca9c6d24121..bb81379349b 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2998,67 +2998,61 @@ ServerI::setStateNoSync(InternalServerState st, const std::string& reason)
 
     if(_node->getTraceLevels()->server > 1)
     {
+        Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
         if(_state == ServerI::Active)
         {
-            Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
             out << "changed server `" << _id << "' state to `Active'";
         }
         else if(_state == ServerI::Inactive)
         {
             if(_node->getTraceLevels()->server != 2 && !(previous == ServerI::Loading || previous == ServerI::Patching))
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Inactive'";
             }
         }
         else if(_state == ServerI::Destroyed)
         {
-            Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
             out << "changed server `" << _id << "' state to `Destroyed'";
         }
         else if(_node->getTraceLevels()->server > 2)
         {
             if(_state == ServerI::WaitForActivation)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `WaitForActivation'";
             }
             else if(_state == ServerI::ActivationTimeout)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `ActivationTimeout'";
             }
             else if(_state == ServerI::Activating)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Activating'";
             }
             else if(_state == ServerI::Deactivating)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Deactivating'";
             }
             else if(_state == ServerI::DeactivatingWaitForProcess)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `DeactivatingWaitForProcess'";
             }
             else if(_state == ServerI::Destroying)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Destroying'";
             }
             else if(_state == ServerI::Loading)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Loading'";
             }
             else if(_state == ServerI::Patching)
             {
-                Ice::Trace out(_node->getTraceLevels()->logger, _node->getTraceLevels()->serverCat);
                 out << "changed server `" << _id << "' state to `Loading'";
             }
         }
+        if(!reason.empty())
+        {
+            out << "\nreason = " << reason;
+        }
     }
 }