Merge branch 'LYN-8025_PipeEditorServerLogsToEditor' into LYN-8514_AutomatedReviewServerLogChecks

Code/Legacy/CrySystem/AZCoreLogSink.h

@@ -127,7 +127,7 @@ public:
             CryLogAlways("%s", message);
         }
 
-        return true; // suppress default AzCore behavior.
+        return m_suppressSystemOutput;
 #else
         AZ_UNUSED(fileName);
         AZ_UNUSED(line);
@@ -147,7 +147,7 @@ public:
             return false; // allow AZCore to do its default behavior.
         }
         gEnv->pLog->LogError("(%s) - %s", window, message);
-        return true; // suppress default AzCore behavior.
+        return m_suppressSystemOutput;
     }
 
     bool OnPreWarning(const char* window, const char* fileName, int line, const char* func, const char* message) override

Gems/Multiplayer/Code/Source/Editor/MultiplayerEditorSystemComponent.cpp

@@ -156,6 +156,7 @@ namespace Multiplayer
             [[fallthrough]];
         case eNotify_OnEndGameMode:
             // Kill the configured server if it's active
+            AZ::TickBus::Handler::BusDisconnect();
             if (m_serverProcessWatcher)
             {
                 m_serverProcessWatcher->TerminateProcess(0);
@@ -168,9 +169,7 @@ namespace Multiplayer
                 m_serverProcessWatcher = nullptr;
                 m_serverProcessTracePrinter = nullptr;
             }
-
-            AZ::TickBus::Handler::BusDisconnect();
-
+            
             if (INetworkInterface* editorNetworkInterface = AZ::Interface<INetworking>::Get()->RetrieveNetworkInterface(AZ::Name(MpEditorInterfaceName)))
             {
                 editorNetworkInterface->Disconnect(m_editorConnId, AzNetworking::DisconnectReason::TerminatedByClient);
@@ -247,10 +246,12 @@ namespace Multiplayer
         // Stop the previous server if one exists
         if (m_serverProcessWatcher)
         {
+            AZ::TickBus::Handler::BusDisconnect();
             m_serverProcessWatcher->TerminateProcess(0);
         }
         m_serverProcessWatcher.reset(outProcess);
         m_serverProcessTracePrinter = AZStd::make_unique<ProcessCommunicatorTracePrinter>(m_serverProcessWatcher->GetCommunicator(), "EditorServer");
+        AZ::TickBus::Handler::BusConnect();
     }
 
     void MultiplayerEditorSystemComponent::OnGameEntitiesStarted()
@@ -311,7 +312,6 @@ namespace Multiplayer
 
             // Launch the editor-server
             LaunchEditorServer();
-            AZ::TickBus::Handler::BusConnect();
         }
         else
         {