diff options
author | Ted Trask <ttrask01@yahoo.com> | 2012-01-17 13:45:33 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2012-01-17 13:53:11 +0000 |
commit | 723f30612f0dc7667535e03b26377f2aaaedb22b (patch) | |
tree | e92d6531db11585a539ef1beb45e1cff93c1a88f | |
parent | c3fd601a1366a7d9df16946d0f48234467c98930 (diff) | |
download | alpine_aports-723f30612f0dc7667535e03b26377f2aaaedb22b.tar.bz2 alpine_aports-723f30612f0dc7667535e03b26377f2aaaedb22b.tar.xz alpine_aports-723f30612f0dc7667535e03b26377f2aaaedb22b.zip |
Revert "main/acf-weblog: strip TCP_DENIED from logs"
This reverts commit 7c45bf94207fd982b32d074845b810cb0c14a371.
(cherry picked from commit bcbb6de60d07ea8e380c9f288228100096abab29)
-rw-r--r-- | main/acf-weblog/0001-Do-not-import-TCP_DENIED-lines.patch | 33 | ||||
-rw-r--r-- | main/acf-weblog/APKBUILD | 18 |
2 files changed, 3 insertions, 48 deletions
diff --git a/main/acf-weblog/0001-Do-not-import-TCP_DENIED-lines.patch b/main/acf-weblog/0001-Do-not-import-TCP_DENIED-lines.patch deleted file mode 100644 index e7f284d3ec..0000000000 --- a/main/acf-weblog/0001-Do-not-import-TCP_DENIED-lines.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 39417cdb0db6b80b6a8fd38e05b77e75d90717b8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 20 Dec 2011 14:19:37 +0100 | ||
4 | Subject: [PATCH] Do not import TCP_DENIED lines | ||
5 | |||
6 | Those pages were never showed to the client so there is no point in store | ||
7 | those for analyzing. Some applications (like Nokia connection suite) will | ||
8 | ignore an auth reject and will retry several times per second which will | ||
9 | flood the logs. | ||
10 | --- | ||
11 | weblog-model.lua | 6 ++++++ | ||
12 | 1 files changed, 6 insertions(+), 0 deletions(-) | ||
13 | |||
14 | diff --git a/weblog-model.lua b/weblog-model.lua | ||
15 | index 07222fd..fe6fc37 100644 | ||
16 | --- a/weblog-model.lua | ||
17 | +++ b/weblog-model.lua | ||
18 | @@ -652,6 +652,12 @@ local function parsesquidlog(line) | ||
19 | |||
20 | checkwords(logentry) | ||
21 | |||
22 | + -- Don't care about TCP_DENIED so apps like dropbox, nokia connection | ||
23 | + -- suite does not flood our logs. | ||
24 | + if logentry.code == nil or logentry.code == "TCP_DENIED" then | ||
25 | + return nil | ||
26 | + end | ||
27 | + | ||
28 | -- Don't care about local requests (from DG) (this check also removes blank lines) | ||
29 | if logentry.clientip and logentry.clientip ~= "127.0.0.1" then | ||
30 | logentry.logdatetime = os.date("%Y-%m-%d %H:%M:%S", logentry.logdatetime)..string.match(logentry.logdatetime, "%..*") | ||
31 | -- | ||
32 | 1.7.8.3 | ||
33 | |||
diff --git a/main/acf-weblog/APKBUILD b/main/acf-weblog/APKBUILD index 1cff68ab6c..85925993c4 100644 --- a/main/acf-weblog/APKBUILD +++ b/main/acf-weblog/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Maintainer: Ted Trask <ttrask01@yahoo.com> | 2 | # Maintainer: Ted Trask <ttrask01@yahoo.com> |
3 | pkgname=acf-weblog | 3 | pkgname=acf-weblog |
4 | pkgver=0.6.1 | 4 | pkgver=0.6.1 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="ACF for web proxy (squid and dansguardian) logfiles" | 6 | pkgdesc="ACF for web proxy (squid and dansguardian) logfiles" |
7 | url="http://git.alpinelinux.org/cgit/acf-weblog" | 7 | url="http://git.alpinelinux.org/cgit/acf-weblog" |
8 | arch="noarch" | 8 | arch="noarch" |
@@ -11,23 +11,11 @@ depends="acf-core lua lua-sql-postgres wget postgresql-client" | |||
11 | makedepends="" | 11 | makedepends="" |
12 | install="$pkgname.post-upgrade" | 12 | install="$pkgname.post-upgrade" |
13 | subpackages="" | 13 | subpackages="" |
14 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 14 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2" |
15 | 0001-Do-not-import-TCP_DENIED-lines.patch | ||
16 | " | ||
17 | 15 | ||
18 | prepare() { | ||
19 | cd "$srcdir"/$pkgname-$pkgver | ||
20 | for i in $source; do | ||
21 | case $i in | ||
22 | *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; | ||
23 | esac | ||
24 | done | ||
25 | } | ||
26 | |||
27 | package() { | 16 | package() { |
28 | cd "$srcdir"/$pkgname-$pkgver | 17 | cd "$srcdir"/$pkgname-$pkgver |
29 | make DESTDIR="$pkgdir" install | 18 | make DESTDIR="$pkgdir" install |
30 | } | 19 | } |
31 | 20 | ||
32 | md5sums="9690f8ebdb6e5cb4e67d72ed01f03730 acf-weblog-0.6.1.tar.bz2 | 21 | md5sums="9690f8ebdb6e5cb4e67d72ed01f03730 acf-weblog-0.6.1.tar.bz2" |
33 | 1235af17a1dc3b787cd6401945aa12f6 0001-Do-not-import-TCP_DENIED-lines.patch" | ||