From: Justin Luth <justin_luth@sil.org>
Date: Sat, 30 Dec 2017 05:48:37 +0000 (+0300)
Subject: updxlrator: show hostaddr in debuglog
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e331e22bda26e53cd71d04e43d4d8a9d9306b51e;p=people%2Fdweismueller%2Fipfire-2.x.git

updxlrator: show hostaddr in debuglog

There is nowhere in the debuglog any indication of
which client is requesting the file that updxlrator
is providing (or caching). Especially for those
huge Windows 10 downloads, it is valuable to
see which client is requesting them, especially
when the same client requests the same download
multiple times a second.

This only impacts users who turn on debugging.

Signed-off-by: Justin Luth  <jluth@mail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator
index bc9878638..ff23b3a95 100644
--- a/config/updxlrator/updxlrator
+++ b/config/updxlrator/updxlrator
@@ -399,7 +399,7 @@ sub check_cache
 	   )
 	{
 		&debuglog("File exists in cache and is up to date");
-		&debuglog("Retrieving file from cache ($updsource)");
+		&debuglog("Retrieving file from cache ($updsource) for $hostaddr");
 		&setcachestatus("$updcachedir/$vendorid/$uuid/access.log",time);
 		$cacheurl="http://$netsettings{'GREEN_ADDRESS'}:$http_port/updatecache/$vendorid/$uuid/$updfile";
 	}
@@ -427,7 +427,7 @@ sub check_cache
 		&debuglog("Free disk space: " . &diskfree($updcachedir));
 		&debuglog("Disk usage: " . &diskusage($updcachedir) . "% (max. $maxusage%)");
 		if (-e "$updcachedir/download/$vendorid/$updfile") { &debuglog("File download/$vendorid/$updfile exists"); }
-		&debuglog("Retrieving file from source ($updsource)");
+		&debuglog("Retrieving file from source ($updsource) for $hostaddr");
 		if ((!$passive_mode) && (&diskusage($updcachedir) <= $maxusage) && ($remote_size <= &diskfree($updcachedir)) && (!-e "$updcachedir/download/$vendorid/$updfile"))
 		{
 			&debuglog("Running command $nice$apphome/bin/download $vendorid $sourceurl $cfmirror &");