Clean up caching log messages.

2 files changed, 25 insertions, 18 deletions

diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index 6f6225b4..1bc01d44 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -862,13 +862,13 @@ static HRESULT ApplyCachePackage(
                 }
             }
 
-            LogErrorId(hr, MSG_APPLY_RETRYING_PACKAGE, pPackage->sczId, NULL, NULL);
+            LogErrorId(hr, MSG_CACHE_RETRYING_PACKAGE, pPackage->sczId, NULL, NULL);
 
             continue;
         }
         else if (BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION_IGNORE == cachePackageCompleteAction && !pPackage->fVital) // ignore non-vital download failures.
         {
-            LogId(REPORT_STANDARD, MSG_APPLY_CONTINUING_NONVITAL_PACKAGE, pPackage->sczId, hr);
+            LogId(REPORT_STANDARD, MSG_CACHE_CONTINUING_NONVITAL_PACKAGE, pPackage->sczId, hr);
             hr = S_OK;
         }
         else if (fCanceledBegin)
@@ -1003,7 +1003,7 @@ static HRESULT ApplyLayoutContainer(
             pContext->qwSuccessfulCacheProgress -= pContainer->qwCommittedCacheProgress;
             pContainer->qwCommittedCacheProgress = 0;
             ReleaseNullStr(pContext->sczLastUsedFolderCandidate);
-            LogErrorId(hr, MSG_APPLY_RETRYING_CONTAINER, pContainer->sczId, NULL, NULL);
+            LogErrorId(hr, MSG_CACHE_RETRYING_CONTAINER, pContainer->sczId, NULL, NULL);
         }
     }
 
@@ -1062,7 +1062,7 @@ static HRESULT ApplyProcessPayload(
             pContext->qwSuccessfulCacheProgress -= pPayloadGroupItem->qwCommittedCacheProgress;
             pPayloadGroupItem->qwCommittedCacheProgress = 0;
             ReleaseNullStr(pContext->sczLastUsedFolderCandidate);
-            LogErrorId(hr, MSG_APPLY_RETRYING_PAYLOAD, pPayload->sczKey, NULL, NULL);
+            LogErrorId(hr, MSG_CACHE_RETRYING_PAYLOAD, pPayload->sczKey, NULL, NULL);
         }
     }
 
@@ -1644,7 +1644,7 @@ static HRESULT CopyPayload(
     HANDLE hDestinationFile = INVALID_HANDLE_VALUE;
     HANDLE hSourceOpenedFile = INVALID_HANDLE_VALUE;
 
-    DWORD dwLogId = pProgress->pContainer ? (pProgress->pPayloadGroupItem ? MSG_ACQUIRE_CONTAINER_PAYLOAD : MSG_ACQUIRE_CONTAINER) : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
+    DWORD dwLogId = pProgress->pContainer ? MSG_ACQUIRE_CONTAINER : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
     LogId(REPORT_STANDARD, dwLogId, wzPackageOrContainerId, wzPayloadId, "copy", wzSourcePath);
 
     hr = PreparePayloadDestinationPath(wzDestinationPath);
@@ -1707,7 +1707,7 @@ static HRESULT DownloadPayload(
     DOWNLOAD_AUTHENTICATION_CALLBACK authenticationCallback = { };
     APPLY_AUTHENTICATION_REQUIRED_DATA authenticationData = { };
 
-    DWORD dwLogId = pProgress->pContainer ? (pProgress->pPayloadGroupItem ? MSG_ACQUIRE_CONTAINER_PAYLOAD : MSG_ACQUIRE_CONTAINER) : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
+    DWORD dwLogId = pProgress->pContainer ? MSG_ACQUIRE_CONTAINER : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
     LogId(REPORT_STANDARD, dwLogId, wzPackageOrContainerId, wzPayloadId, "download", pDownloadSource->sczUrl);
 
     hr = PreparePayloadDestinationPath(wzDestinationPath);
diff --git a/src/engine/engine.mc b/src/engine/engine.mc
index 6e0695bc..25d5b4e4 100644
--- a/src/engine/engine.mc
+++ b/src/engine/engine.mc
@@ -717,13 +717,6 @@ Language=English
 Acquiring container: %1!ls!, %3!hs! from: %4!ls!
 .
 
-MessageId=337
-Severity=Success
-SymbolicName=MSG_ACQUIRE_CONTAINER_PAYLOAD
-Language=English
-Acquiring container: %1!ls!, payload: %2!ls!, %3!hs! from: %4!ls!
-.
-
 MessageId=338
 Severity=Success
 SymbolicName=MSG_ACQUIRE_PACKAGE_PAYLOAD
@@ -738,25 +731,39 @@ Language=English
 Failed to verify container: %2!ls! at path: %3!ls!, error: %1!ls!. Deleting file.
 .
 
+MessageId=340
+Severity=Warning
+SymbolicName=MSG_CACHE_CONTINUING_NONVITAL_PACKAGE
+Language=English
+Cached non-vital package: %1!ls!, encountered error: 0x%2!x!. Continuing...
+.
+
+MessageId=346
+Severity=Warning
+SymbolicName=MSG_CACHE_RETRYING_PACKAGE
+Language=English
+Application requested retry of caching package: %1!ls!, encountered error: 0x%2!x!. Retrying...
+.
+
 MessageId=347
 Severity=Warning
-SymbolicName=MSG_APPLY_RETRYING_CONTAINER
+SymbolicName=MSG_CACHE_RETRYING_CONTAINER
 Language=English
-Application requested retry of container: %2!ls!, encountered error: %1!ls!. Retrying...
+Application requested retry of caching container: %2!ls!, encountered error: %1!ls!. Retrying...
 .
 
 MessageId=348
 Severity=Warning
 SymbolicName=MSG_APPLY_RETRYING_PACKAGE
 Language=English
-Application requested retry of package: %1!ls!, encountered error: 0x%2!x!. Retrying...
+Application requested retry of executing package: %1!ls!, encountered error: 0x%2!x!. Retrying...
 .
 
 MessageId=349
 Severity=Warning
-SymbolicName=MSG_APPLY_RETRYING_PAYLOAD
+SymbolicName=MSG_CACHE_RETRYING_PAYLOAD
 Language=English
-Application requested retry of payload: %2!ls!, encountered error: %1!ls!. Retrying...
+Application requested retry of caching payload: %2!ls!, encountered error: %1!ls!. Retrying...
 .
 
 MessageId=350