Improvements to cache reporting

- Avoid "Entry not saved: reason unknown" when entry was not restored
- Avoid "Entry not saved: Encryption key not provided" when no config-cache data found
- Avoid spurious log message when no config-cache data found
This commit is contained in:
daz 2023-12-23 11:26:48 -07:00
parent df38ec05e0
commit 93050d1483
No known key found for this signature in database
2 changed files with 10 additions and 4 deletions

View File

@ -393,7 +393,7 @@ export class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
if (cacheEntries.length > 0) { if (cacheEntries.length > 0) {
core.info(`Not restoring configuration-cache state, as ${reason}`) core.info(`Not restoring configuration-cache state, as ${reason}`)
for (const cacheEntry of cacheEntries) { for (const cacheEntry of cacheEntries) {
listener.entry(cacheEntry.pattern).markNotRestored(reason).markNotSaved(reason) listener.entry(cacheEntry.pattern).markNotRestored(reason)
} }
// Update the results file based on no entries restored // Update the results file based on no entries restored
@ -403,9 +403,12 @@ export class ConfigurationCacheEntryExtractor extends AbstractEntryExtractor {
async extract(listener: CacheListener): Promise<void> { async extract(listener: CacheListener): Promise<void> {
if (!params.getCacheEncryptionKey()) { if (!params.getCacheEncryptionKey()) {
core.info('Not saving configuration-cache state, as no encryption key was provided') const cacheEntryDefinitions = this.getExtractedCacheEntryDefinitions()
for (const cacheEntry of this.getExtractedCacheEntryDefinitions()) { if (cacheEntryDefinitions.length > 0) {
listener.entry(cacheEntry.pattern).markNotSaved('No encryption key provided') core.info('Not saving configuration-cache state, as no encryption key was provided')
for (const cacheEntry of cacheEntryDefinitions) {
listener.entry(cacheEntry.pattern).markNotSaved('No encryption key provided')
}
} }
return return
} }

View File

@ -198,6 +198,9 @@ function getSavedMessage(entry: CacheEntryListener, cacheReadOnly: boolean): str
if (cacheReadOnly) { if (cacheReadOnly) {
return '(Entry not saved: cache is read-only)' return '(Entry not saved: cache is read-only)'
} }
if (entry.notRestored) {
return '(Entry not saved: not restored)'
}
return '(Entry not saved: reason unknown)' return '(Entry not saved: reason unknown)'
} }
if (entry.savedSize === 0) { if (entry.savedSize === 0) {