Clean up caching log messages.
Sean Hall committed
Apr 17, 2021 at 21:07 UTC
707e77212e105cd7fa8a74baca6efa3ae3e6d6b3
2 files changed
+25
-18
src/engine/apply.cpp
+6
-6
@@ -862,13 +862,13 @@ static HRESULT ApplyCachePackage(
862
}
863
}
864
865
- LogErrorId(hr, MSG_APPLY_RETRYING_PACKAGE, pPackage->sczId, NULL, NULL);
865
+ LogErrorId(hr, MSG_CACHE_RETRYING_PACKAGE, pPackage->sczId, NULL, NULL);
866
867
continue;
868
}
869
else if (BOOTSTRAPPER_CACHEPACKAGECOMPLETE_ACTION_IGNORE == cachePackageCompleteAction && !pPackage->fVital) // ignore non-vital download failures.
870
{
871
- LogId(REPORT_STANDARD, MSG_APPLY_CONTINUING_NONVITAL_PACKAGE, pPackage->sczId, hr);
871
+ LogId(REPORT_STANDARD, MSG_CACHE_CONTINUING_NONVITAL_PACKAGE, pPackage->sczId, hr);
872
hr = S_OK;
873
}
874
else if (fCanceledBegin)
@@ -1003,7 +1003,7 @@ static HRESULT ApplyLayoutContainer(
1003
pContext->qwSuccessfulCacheProgress -= pContainer->qwCommittedCacheProgress;
1004
pContainer->qwCommittedCacheProgress = 0;
1005
ReleaseNullStr(pContext->sczLastUsedFolderCandidate);
1006
- LogErrorId(hr, MSG_APPLY_RETRYING_CONTAINER, pContainer->sczId, NULL, NULL);
1006
+ LogErrorId(hr, MSG_CACHE_RETRYING_CONTAINER, pContainer->sczId, NULL, NULL);
1007
}
1008
}
1009
@@ -1062,7 +1062,7 @@ static HRESULT ApplyProcessPayload(
1062
pContext->qwSuccessfulCacheProgress -= pPayloadGroupItem->qwCommittedCacheProgress;
1063
pPayloadGroupItem->qwCommittedCacheProgress = 0;
1064
ReleaseNullStr(pContext->sczLastUsedFolderCandidate);
1065
- LogErrorId(hr, MSG_APPLY_RETRYING_PAYLOAD, pPayload->sczKey, NULL, NULL);
1065
+ LogErrorId(hr, MSG_CACHE_RETRYING_PAYLOAD, pPayload->sczKey, NULL, NULL);
1066
}
1067
}
1068
@@ -1644,7 +1644,7 @@ static HRESULT CopyPayload(
1644
HANDLE hDestinationFile = INVALID_HANDLE_VALUE;
1645
HANDLE hSourceOpenedFile = INVALID_HANDLE_VALUE;
1646
1647
- DWORD dwLogId = pProgress->pContainer ? (pProgress->pPayloadGroupItem ? MSG_ACQUIRE_CONTAINER_PAYLOAD : MSG_ACQUIRE_CONTAINER) : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
1647
+ DWORD dwLogId = pProgress->pContainer ? MSG_ACQUIRE_CONTAINER : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
1648
LogId(REPORT_STANDARD, dwLogId, wzPackageOrContainerId, wzPayloadId, "copy", wzSourcePath);
1649
1650
hr = PreparePayloadDestinationPath(wzDestinationPath);
@@ -1707,7 +1707,7 @@ static HRESULT DownloadPayload(
1707
DOWNLOAD_AUTHENTICATION_CALLBACK authenticationCallback = { };
1708
APPLY_AUTHENTICATION_REQUIRED_DATA authenticationData = { };
1709
1710
- DWORD dwLogId = pProgress->pContainer ? (pProgress->pPayloadGroupItem ? MSG_ACQUIRE_CONTAINER_PAYLOAD : MSG_ACQUIRE_CONTAINER) : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
1710
+ DWORD dwLogId = pProgress->pContainer ? MSG_ACQUIRE_CONTAINER : pProgress->pPackage ? MSG_ACQUIRE_PACKAGE_PAYLOAD : MSG_ACQUIRE_BUNDLE_PAYLOAD;
1711
LogId(REPORT_STANDARD, dwLogId, wzPackageOrContainerId, wzPayloadId, "download", pDownloadSource->sczUrl);
1712
1713
hr = PreparePayloadDestinationPath(wzDestinationPath);
src/engine/engine.mc
+19
-12
@@ -717,13 +717,6 @@ Language=English
717
Acquiring container: %1!ls!, %3!hs! from: %4!ls!
718
.
719
720
-MessageId=337
721
-Severity=Success
722
-SymbolicName=MSG_ACQUIRE_CONTAINER_PAYLOAD
723
-Language=English
724
-Acquiring container: %1!ls!, payload: %2!ls!, %3!hs! from: %4!ls!
725
-.
726
-
720
MessageId=338
721
Severity=Success
722
SymbolicName=MSG_ACQUIRE_PACKAGE_PAYLOAD
@@ -738,25 +731,39 @@ Language=English
731
Failed to verify container: %2!ls! at path: %3!ls!, error: %1!ls!. Deleting file.
732
.
733
734
+MessageId=340
735
+Severity=Warning
736
+SymbolicName=MSG_CACHE_CONTINUING_NONVITAL_PACKAGE
737
+Language=English
738
+Cached non-vital package: %1!ls!, encountered error: 0x%2!x!. Continuing...
739
+.
740
+
741
+MessageId=346
742
+Severity=Warning
743
+SymbolicName=MSG_CACHE_RETRYING_PACKAGE
744
+Language=English
745
+Application requested retry of caching package: %1!ls!, encountered error: 0x%2!x!. Retrying...
746
+.
747
+
748
MessageId=347
749
Severity=Warning
743
-SymbolicName=MSG_APPLY_RETRYING_CONTAINER
750
+SymbolicName=MSG_CACHE_RETRYING_CONTAINER
751
Language=English
745
-Application requested retry of container: %2!ls!, encountered error: %1!ls!. Retrying...
752
+Application requested retry of caching container: %2!ls!, encountered error: %1!ls!. Retrying...
753
.
754
755
MessageId=348
756
Severity=Warning
757
SymbolicName=MSG_APPLY_RETRYING_PACKAGE
758
Language=English
752
-Application requested retry of package: %1!ls!, encountered error: 0x%2!x!. Retrying...
759
+Application requested retry of executing package: %1!ls!, encountered error: 0x%2!x!. Retrying...
760
.
761
762
MessageId=349
763
Severity=Warning
757
-SymbolicName=MSG_APPLY_RETRYING_PAYLOAD
764
+SymbolicName=MSG_CACHE_RETRYING_PAYLOAD
765
Language=English
759
-Application requested retry of payload: %2!ls!, encountered error: %1!ls!. Retrying...
766
+Application requested retry of caching payload: %2!ls!, encountered error: %1!ls!. Retrying...
767
.
768
769
MessageId=350