summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2011-10-20 17:24:49 +0000
committerTed Trask <ttrask01@yahoo.com>2011-10-20 17:24:49 +0000
commit68d162583abeb8784e5f373ac9f5cf4e6906e151 (patch)
tree1651b6dd1be3ad748806ed8a2a672ddfd5a4eff8
parent3c88c2d1f4dd515498d4b53d13673f20610e3777 (diff)
downloadacf-weblog-68d162583abeb8784e5f373ac9f5cf4e6906e151.tar.bz2
acf-weblog-68d162583abeb8784e5f373ac9f5cf4e6906e151.tar.xz
Fixed bug with no user authentication by removing bad check
-rw-r--r--weblog-model.lua8
1 files changed, 3 insertions, 5 deletions
diff --git a/weblog-model.lua b/weblog-model.lua
index 8d0c9a8..e6989a4 100644
--- a/weblog-model.lua
+++ b/weblog-model.lua
@@ -559,7 +559,7 @@ local function parsesquidlog(line)
bytes=words[5],
method=words[6],
URL=words[7],
- clientuserid=string.gsub(words[8],"%%(%x%x)",""),
+ clientuserid=words[8],
peerstatus=string.match(words[9] or "", "^[^/]*"),
peerhost=string.match(words[9] or "", "[^/]*$"),
squarkcategory=string.match(words[11] or "", "^[^,]*"),
@@ -569,10 +569,8 @@ local function parsesquidlog(line)
-- Don't care about local requests (from DG) (this check also removes blank lines)
if logentry.clientip and logentry.clientip ~= "127.0.0.1" then
- if logentry.clientuserid and logentry.clientuserid ~= "-" then
- logentry.logdatetime = os.date("%Y-%m-%d %H:%M:%S", logentry.logdatetime)..string.match(logentry.logdatetime, "%..*")
- return logentry
- end
+ logentry.logdatetime = os.date("%Y-%m-%d %H:%M:%S", logentry.logdatetime)..string.match(logentry.logdatetime, "%..*")
+ return logentry
end
return nil
end