From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Mon, 25 Jan 2016 08:26:32 +0000 (+1300)
Subject: Make %<a and %<p details available to [eCAP] RESPMOD services
X-Git-Tag: SQUID_4_0_5~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d1dac7930ed0f7cfa4aae0993613b1f96358134;p=thirdparty%2Fsquid.git

Make %<a and %<p details available to [eCAP] RESPMOD services

... via adaptation_meta.

This patch fills access log entry with server connection
details as soon as possible. Previously, ALE was updated only
in prepareLogWithRequestDetails() when adaptation process has
already finished.
---

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 333c2b73fa..3658dcce8a 100644
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -400,7 +400,7 @@ FwdState::startConnectionOrFail()
         // Done here before anything else so the errors get logged for
         // this server link regardless of what happens when connecting to it.
         // IF sucessfuly connected this top destination will become the serverConnection().
-        request->hier.note(serverDestinations[0], request->url.host());
+        syncHierNote(serverDestinations[0], request->url.host());
         request->clearError();
 
         connectStart();
@@ -796,7 +796,14 @@ FwdState::syncWithServerConn(const char *host)
         Ip::Qos::setSockNfmark(serverConn, GetNfmarkToServer(request));
 #endif
 
-    request->hier.note(serverConn, host);
+    syncHierNote(serverConn, host);
+}
+
+void
+FwdState::syncHierNote(const Comm::ConnectionPointer &server, const char *host)
+{
+    request->hier.note(server, host);
+    al->hier.note(server, host);
 }
 
 /**
diff --git a/src/FwdState.h b/src/FwdState.h
index 321b6db868..e38cbf09d3 100644
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -121,6 +121,7 @@ private:
     void closeServerConnection(const char *reason);
 
     void syncWithServerConn(const char *host);
+    void syncHierNote(const Comm::ConnectionPointer &server, const char *host);
 
 public:
     StoreEntry *entry;