From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sun, 18 Feb 2024 00:45:41 +0000 (+0000)
Subject: Fix debugging for responses that Expire at check time (#1683)
X-Git-Tag: SQUID_7_0_1~207
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e806d767cb63e39a64140b6433442a48c2f64812;p=thirdparty%2Fsquid.git

Fix debugging for responses that Expire at check time (#1683)

Since 2000 commit 65fa5c6, our level-3 debugging mislead about Expires
being less than the check time when the two times were identical. The
actual checked conditions are correct: Roughly speaking, the response
with Expires value T is considered expired at that time T.

Also dropped extra (and inconsistent) trailing space on debugs() lines.
This space was added by the same 2000 commit, probably accidentally.
---

diff --git a/src/refresh.cc b/src/refresh.cc
index 7e83fe2a04..3e48cc0861 100644
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -144,14 +144,10 @@ refreshStaleness(const StoreEntry * entry, time_t check_time, const time_t age,
         sf->expires = true;
 
         if (entry->expires > check_time) {
-            debugs(22, 3, "FRESH: expires " << entry->expires <<
-                   " >= check_time " << check_time << " ");
-
+            debugs(22, 3, "FRESH: expires " << entry->expires << " > check_time " << check_time);
             return -1;
         } else {
-            debugs(22, 3, "STALE: expires " << entry->expires <<
-                   " < check_time " << check_time << " ");
-
+            debugs(22, 3, "STALE: expires " << entry->expires << " <= check_time " << check_time);
             return (check_time - entry->expires);
         }
     }
@@ -160,7 +156,7 @@ refreshStaleness(const StoreEntry * entry, time_t check_time, const time_t age,
 
     // 2. If the entry is older than the maximum age in the refresh_pattern, it is STALE.
     if (age > R->max) {
-        debugs(22, 3, "STALE: age " << age << " > max " << R->max << " ");
+        debugs(22, 3, "STALE: age " << age << " > max " << R->max);
         sf->max = true;
         return (age - R->max);
     }