bneradt commented on PR #13168:
URL: https://github.com/apache/trafficserver/pull/13168#issuecomment-4482973654
The format issues can be fixed locally by running the `--target format`
cmake target.
Here's the failed format job report, in case it's helpful:
```patch
diff --git a/doc/admin-guide/logging/formatting.en.rst
b/doc/admin-guide/logging/formatting.en.rst
index c2f2bc8aa0..58e5ae5fe6 100644
--- a/doc/admin-guide/logging/formatting.en.rst
+++ b/doc/admin-guide/logging/formatting.en.rst
@@ -196,7 +196,7 @@ cfl Proxy Cache Freshness limit (in seconds) for
the cached object.
cca Proxy Cache Current age (in seconds) of the cached object at serve
time. Computed from internal state without reading
response headers. Value is ``-1`` if not applicable.
-
+
===== ==============
==========================================================
.. _admin-logging-fields-txn:
diff --git a/include/proxy/http/HttpTransact.h
b/include/proxy/http/HttpTransact.h
index 6db51b97dc..056e6df2ca 100644
--- a/include/proxy/http/HttpTransact.h
+++ b/include/proxy/http/HttpTransact.h
@@ -490,8 +490,8 @@ public:
HTTPInfo transform_store;
CacheDirectives directives;
HTTPInfo *object_read = nullptr;
- int freshness_limit = -1; // seconds; -1 = not yet
set
- ink_time_t current_age = -1; // seconds; -1
= not yet set
+ int freshness_limit = -1; // seconds; -1 = not
yet set
+ ink_time_t current_age = -1; // seconds; -1 = not
yet set
HTTPInfo *stale_fallback = nullptr; // Saved stale object
for action 6 fallback during retry
CacheWriteLock_t write_lock_state = CacheWriteLock_t::INIT;
int lookup_count = 0;
diff --git a/include/proxy/logging/TransactionLogData.h
b/include/proxy/logging/TransactionLogData.h
index 7c3a9d3463..18618b9cd0 100644
--- a/include/proxy/logging/TransactionLogData.h
+++ b/include/proxy/logging/TransactionLogData.h
@@ -159,13 +159,13 @@ public:
int64_t get_congestion_control_crat() const;
// ===== Cache state =====
- int get_cache_write_code() const;
- int get_cache_transform_write_code() const;
- int get_cache_open_read_tries() const;
- int get_cache_open_write_tries() const;
- int get_freshness_limit() const;
+ int get_cache_write_code() const;
+ int get_cache_transform_write_code() const;
+ int get_cache_open_read_tries() const;
+ int get_cache_open_write_tries() const;
+ int get_freshness_limit() const;
int64_t get_current_age() const;
- int get_max_cache_open_write_retries() const;
+ int get_max_cache_open_write_retries() const;
// ===== Retry attempts =====
int64_t get_simple_retry_attempts() const;
diff --git a/src/proxy/http/HttpTransact.cc b/src/proxy/http/HttpTransact.cc
index 452cd60c65..5ab141bdc1 100644
--- a/src/proxy/http/HttpTransact.cc
+++ b/src/proxy/http/HttpTransact.cc
@@ -7581,14 +7581,14 @@ HttpTransact::what_is_document_freshness(State *s,
HTTPHdr *client_request, HTTP
return Freshness_t::STALE;
}
- response_date = cached_obj_response->get_date();
- fresh_limit = calculate_document_freshness_limit(s,
cached_obj_response, response_date, &heuristic);
- s->cache_info.freshness_limit = fresh_limit; // save for logging
+ response_date = cached_obj_response->get_date();
+ fresh_limit = calculate_document_freshness_limit(s,
cached_obj_response, response_date, &heuristic);
+ s->cache_info.freshness_limit = fresh_limit; // save for logging
ink_assert(fresh_limit >= 0);
current_age =
HttpTransactCache::calculate_document_age(s->request_sent_time,
s->response_received_time, cached_obj_response,
response_date,
s->current.now);
-
+
s->cache_info.current_age = current_age;
// First check overflow status
diff --git a/src/proxy/logging/Log.cc b/src/proxy/logging/Log.cc
index 0647309ceb..7e401b0fd7 100644
--- a/src/proxy/logging/Log.cc
+++ b/src/proxy/logging/Log.cc
@@ -722,8 +722,8 @@ Log::init_fields()
global_field_list.add(field, false);
field_symbol_hash.emplace("chm", field);
- field = new LogField("cache_freshness_limit", "cfl", LogField::sINT,
&LogAccess::marshal_cache_freshness_limit,
- &LogAccess::unmarshal_int_to_str);
+ field = new LogField("cache_freshness_limit", "cfl", LogField::sINT,
&LogAccess::marshal_cache_freshness_limit,
+ &LogAccess::unmarshal_int_to_str);
global_field_list.add(field, false);
field_symbol_hash.emplace("cfl", field);
diff --git a/src/proxy/logging/LogAccess.cc b/src/proxy/logging/LogAccess.cc
index 3adeaf2316..0ac1bb045e 100644
--- a/src/proxy/logging/LogAccess.cc
+++ b/src/proxy/logging/LogAccess.cc
@@ -2610,7 +2610,6 @@ LogAccess::marshal_cache_hit_miss(char *buf)
return INK_MIN_ALIGN;
}
-
int
LogAccess::marshal_cache_freshness_limit(char *buf)
{
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
