From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 25 May 2017 12:45:54 +0000 (+1200)
Subject: Fix missing ERROR label on template loading errors
X-Git-Tag: SQUID_4_0_20~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3ac5fdfbe39b36daa8397386ab02937213acfa1;p=thirdparty%2Fsquid.git

Fix missing ERROR label on template loading errors
---

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 0460082876..b18adcbd66 100644
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -332,7 +332,7 @@ TemplateFile::loadFromFile(const char *path)
         /* with dynamic locale negotiation we may see some failures before a success. */
         if (!silent && templateCode < TCP_RESET) {
             int xerrno = errno;
-            debugs(4, DBG_CRITICAL, MYNAME << "'" << path << "': " << xstrerr(xerrno));
+            debugs(4, DBG_CRITICAL, "ERROR: loading file '" << path << "': " << xstrerr(xerrno));
         }
         wasLoaded = false;
         return wasLoaded;
@@ -340,7 +340,7 @@ TemplateFile::loadFromFile(const char *path)
 
     while ((len = FD_READ_METHOD(fd, buf, sizeof(buf))) > 0) {
         if (!parse(buf, len, false)) {
-            debugs(4, DBG_CRITICAL, MYNAME << "parse error while reading template file: " << path);
+            debugs(4, DBG_CRITICAL, "ERROR: parsing error in template file: " << path);
             wasLoaded = false;
             return wasLoaded;
         }