Merge lp:~hloeung/ubuntu-repository-cache/squid-logging-human-sensible-timestamps into lp:ubuntu-repository-cache

[Haw Loeung]

Fix squid logging format to use sensible timestamps rather than milliseconds since epoch - LP:1931155 / LP:1780341

[Haw Loeung (hloeung)]

ubuntu@machine-2:~$ sudo tail /var/log/squid-deb-proxy/access.log -f
1623115336.857 24 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.39 text/html
1623115351.854 25 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.39 text/html
1623115366.841 25 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.39 text/html
1623115383.104 1059 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.39 text/html
1623115383.293 1 127.0.0.1 TCP_MEM_HIT/200 638825 GET http://us.archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_5.0-6ubuntu1_amd64.deb - HIER_NONE/- application/x-debian-package
1623115384.464 85 127.0.0.1 TCP_MISS/200 638818 GET http://us.archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_5.0-6ubuntu1_amd64.deb - HIER_DIRECT/91.189.91.39 application/x-debian-package
1623115385.666 61 127.0.0.1 TCP_MEM_HIT/200 17131593 GET http://us.archive.ubuntu.com/ubuntu/pool/universe/u/ubuntu-wallpapers/ubuntu-wallpapers-xenial_20.04.2-0ubuntu1_all.deb - HIER_NONE/- application/x-debian-package
1623115387.123 144 127.0.0.1 TCP_MISS/200 17131586 GET http://us.archive.ubuntu.com/ubuntu/pool/universe/u/ubuntu-wallpapers/ubuntu-wallpapers-xenial_20.04.2-0ubuntu1_all.deb - HIER_DIRECT/91.189.91.39 application/x-debian-package
1623115397.087 41 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.38 text/html
1623115412.077 24 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.38 text/html

2021-06-08 01:23:47 +0000 25 127.0.0.1 TCP_REFRESH_MODIFIED/200 256 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.38 text/html
2021-06-08 01:24:01 +0000 27 127.0.0.1 TCP_REFRESH_MODIFIED/200 261 HEAD http://us.archive.ubuntu.com/ubuntu/pool/main/ - HIER_DIRECT/91.189.91.38 text/html
2021-06-08 01:24:03 +0000 1 127.0.0.1 TCP_MEM_HIT/200 638825 GET http://us.archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_5.0-6ubuntu1_amd64.deb - HIER_NONE/- application/x-debian-package
2021-06-08 01:24:04 +0000 88 127.0.0.1 TCP_MISS/200 638813 GET http://us.archive.ubuntu.com/ubuntu/pool/main/b/bash/bash_5.0-6ubuntu1_amd64.deb - HIER_DIRECT/91.189.91.38 application/x-debian-package
2021-06-08 01:24:06 +0000 91 127.0.0.1 TCP_MEM_HIT/200 17131593 GET http://us.archive.ubuntu.com/ubuntu/pool/universe/u/ubuntu-wallpapers/ubuntu-wallpapers-xenial_20.04.2-0ubuntu1_all.deb - HIER_NONE/- application/x-debian-package
^C

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~hloeung/ubuntu-repository-cache/squid-logging-human-sensible-timestamps]

341. By Haw Loeung on 2021-06-08

Minus the timezone, which hardly ever changes

[Paul Collins (pjdc)]

review: Approve (lgtm)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 338

=== modified file 'templates/squid-deb-proxy/squid-deb-proxy.conf'
--- templates/squid-deb-proxy/squid-deb-proxy.conf	2021-03-02 22:24:19 +0000
+++ templates/squid-deb-proxy/squid-deb-proxy.conf	2021-06-08 01:41:51 +0000
@@ -1,7 +1,7 @@
 
 #
 #  JUJU WARNING: This file is managed by Juju, do NOT edit
-# 
+#
 
 #       WELCOME TO SQUID DEB PROXY
 #       ------------------
@@ -47,7 +47,8 @@
 
 # use different logs
 cache_log /var/log/squid-deb-proxy/cache.log
-access_log daemon:/var/log/squid-deb-proxy/access.log
+logformat custom-squid %tg{%F %H:%M:%S} %6tr %>a %Ss/%03>Hs %<st %rm %ru %[un %Sh/%<a %mt
+access_log daemon:/var/log/squid-deb-proxy/access.log custom-squid
 
 # tweaks to speed things up
 {{ Cache_Memory_Config }}