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

2021-11-24 17:52:27 -08:00
parent 97b27513e9 77e3dd786d
commit 5426df41ea
2 changed files with 17 additions and 15 deletions
@@ -737,7 +737,18 @@ bool CSystem::Init(const SSystemInitParams& startupParams)

    m_pCmdLine = new CCmdLine(startupParams.szSystemCmdLine);

-    AZCoreLogSink::Connect();
+    // Init AZCoreLogSink. Don't suppress system output if we're running as an editor-server
+    bool suppressSystemOutput = true;
+    if (const ICmdLineArg* isEditorServerArg = m_pCmdLine->FindArg(eCLAT_Pre, "editorsv_isDedicated"))
+    {
+        AZ::CVarFixedString lowercaseValue(isEditorServerArg->GetValue());
+        AZStd::to_lower(lowercaseValue.begin(), lowercaseValue.end());
+        if (lowercaseValue == "true")
+        {
+            suppressSystemOutput = false;
+        }
+    }
+    AZCoreLogSink::Connect(suppressSystemOutput);

    // Registers all AZ Console Variables functors specified within CrySystem
    if (auto azConsole = AZ::Interface<AZ::IConsole>::Get(); azConsole)