github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improve logging

Browse Source
This commit is contained in:
Daniel
2023-08-04 21:50:03 +02:00
parent d0f4392b9d
commit 53c2b82d2e
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
resolver/resolve.go
View File

@@ -293,11 +293,19 @@ func startAsyncQuery(ctx context.Context, q *Query, currentRRCache *RRCache) {
// Set flag and log that we are refreshing this entry.
currentRRCache.RequestingNew = true
log.Tracer(ctx).Tracef(
"resolver: cache for %s will expire in %s, refreshing async now",
q.ID(),
time.Until(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
)
if currentRRCache.Expired() {
log.Tracer(ctx).Tracef(
"resolver: cache for %s has expired %s ago, refreshing async now",
q.ID(),
time.Since(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
)
} else {
log.Tracer(ctx).Tracef(
"resolver: cache for %s will expire in %s, refreshing async now",
q.ID(),
time.Until(time.Unix(currentRRCache.Expires, 0)).Round(time.Second),
)
}
// resolve async
module.StartWorker("resolve async", func(asyncCtx context.Context) error {

4
updates/os_integration_linux.go
View File

@@ -130,8 +130,8 @@ func upgradeSystemIntegrationFileContents(
}
// Check if we are allowed to upgrade from the existing file.
if !slices.Contains[string](permittedUpgradeHashes, existingHexSum) {
return fmt.Errorf("%s at %s %w, as it is not a previously published version and cannot be automatically upgraded - try installing again", name, filePath, ErrRequiresManualUpgrade)
if !slices.Contains[[]string, string](permittedUpgradeHashes, existingHexSum) {
return fmt.Errorf("%s at %s (sha256:%s) %w, as it is not a previously published version and cannot be automatically upgraded - try installing again", name, filePath, existingHexSum, ErrRequiresManualUpgrade)
}
// Start with upgrade!