Logging

Author: JohnMcPMS

src/AppInstallerCLICore/Commands/TestCommand.cpp

@@ -82,6 +82,21 @@ namespace AppInstaller::CLI
             return hr;
         }
 
+        void AppShutdownTestSystemBlockNewWork(CancelReason reason)
+        {
+            AICLI_LOG(CLI, Info, << "AppShutdownTestSystemBlockNewWork :: " << reason);
+        }
+
+        void AppShutdownTestSystemBeginShutdown(CancelReason reason)
+        {
+            AICLI_LOG(CLI, Info, << "AppShutdownTestSystemBeginShutdown :: " << reason);
+        }
+
+        void AppShutdownTestSystemWait()
+        {
+            AICLI_LOG(CLI, Info, << "AppShutdownTestSystemWait");
+        }
+
         void EnsureDSCv3Processor(Execution::Context& context)
         {
             auto& configurationSet = context.Get<Execution::Data::ConfigurationContext>().Set();
@@ -354,6 +369,13 @@ namespace AppInstaller::CLI
     {
         HRESULT hr = E_FAIL;
 
+        ShutdownMonitoring::ServerShutdownSynchronization::ComponentSystem appShutdownTestSystem{};
+        appShutdownTestSystem.BlockNewWork = AppShutdownTestSystemBlockNewWork;
+        appShutdownTestSystem.BeginShutdown = AppShutdownTestSystemBeginShutdown;
+        appShutdownTestSystem.Wait = AppShutdownTestSystemWait;
+
+        ShutdownMonitoring::ServerShutdownSynchronization::AddComponent(appShutdownTestSystem);
+
         // Only package context and admin won't create the window message.
         if (!Runtime::IsRunningInPackagedContext() || !Runtime::IsRunningAsAdmin())
         {

src/AppInstallerCLICore/ShutdownMonitoring.cpp

@@ -376,6 +376,7 @@ namespace AppInstaller::ShutdownMonitoring
             components = m_components;
         }
 
+        AICLI_LOG(CLI, Verbose, << "ServerShutdownSynchronization :: BlockNewWork");
         for (const auto& component : components)
         {
             if (component.BlockNewWork)
@@ -384,6 +385,7 @@ namespace AppInstaller::ShutdownMonitoring
             }
         }
 
+        AICLI_LOG(CLI, Verbose, << "ServerShutdownSynchronization :: BeginShutdown");
         for (const auto& component : components)
         {
             if (component.BeginShutdown)
@@ -392,6 +394,7 @@ namespace AppInstaller::ShutdownMonitoring
             }
         }
 
+        AICLI_LOG(CLI, Verbose, << "ServerShutdownSynchronization :: Wait");
         for (const auto& component : components)
         {
             if (component.Wait)
@@ -400,6 +403,7 @@ namespace AppInstaller::ShutdownMonitoring
             }
         }
 
+        AICLI_LOG(CLI, Verbose, << "ServerShutdownSynchronization :: ShutdownCompleteCallback");
         ShutdownCompleteCallback callback = m_callback;
         if (callback)
         {

src/AppInstallerCLIE2ETests/AppShutdownTests.cs

@@ -95,9 +95,6 @@ public void RegisterApplicationTest()
 
             Task.WaitAll(new Task[] { testCmdTask, registerTask }, 360000);
 
-            // Assert.True(registerTask.Result);
-            TestContext.Out.Write(testCmdTask.Result.StdOut);
-
             // The ctrl-c command terminates the batch file before the exit code file gets created.
             // Look for the output.
             Assert.True(testCmdTask.Result.StdOut.Contains("Succeeded waiting for app shutdown event"));