On Thu, April 12, 2018 00:32, Stuart Henderson wrote: > On 2018/04/11 15:29, Aaron Bieber wrote: >> On Wed, Apr 11, 2018 at 10:09:12PM +0100, Stuart Henderson wrote: >> > On 2018/04/11 22:39, Frederic Cambus wrote: >> > > Hi ports@, >> > > >> > > Here is a diff to drop Tokyo Cabinet storage support, this greatly >> > > speeds up processing time, more than 10 times actually. >> > > >> > > With the current version: >> > > >> > > - Total Requests: 1,347,757 >> > > - Log Size: 282.49 MiB >> > > - Init. Proc. Time: 712 secs >> > > >> > > With the diff applied: >> > > >> > > - Total Requests: 1,347,757 >> > > - Log Size: 282.49 MiB >> > > - Init. Proc. Time: 67 secs >> > > >> > > While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update >> > > license marker to specify the MIT license, which goaccess switched >> > > to since the 1.0 release. >> > > >> > > Comments? OK? >> > >> > It is expected that goaccess is slower with Tokyo Cabinet (it's clear >> > in the manpage), but it allows it to process larger files, and to keep >> > data in persistent storage. >> > >> > I'm not a fan of unnecessary flavours in ports, but I think this might >> > be a case where it makes sense? >> >> I would like it if there was a non-tokyo flavor. It has only ever >> caused problems for me. That said, I am not a very heavy user of it! > > I would suggest using a flavour to _enable_ tokyocabinet rather than > on-by-default. Maybe with a quick explanation why one might want to > use it in DESCR. > > Hi! Does it look good?
Index: Makefile =================================================================== RCS file: /cvs/ports/www/goaccess/Makefile,v retrieving revision 1.17 diff -u -r1.17 Makefile --- Makefile 15 Nov 2017 21:28:05 -0000 1.17 +++ Makefile 12 Apr 2018 05:18:11 -0000 @@ -3,31 +3,38 @@ COMMENT = realtime console web log analyzer DISTNAME = goaccess-1.2 -REVISION = 0 +REVISION = 1 CATEGORIES = www -HOMEPAGE = http://goaccess.io/ +HOMEPAGE = https://goaccess.io/ MAINTAINER = Kirill Bychkov <ki...@openbsd.org> -# GPLv2 +# MIT PERMIT_PACKAGE_CDROM = Yes -WANTLIB += GeoIP bz2 c ncursesw pthread tokyocabinet z +WANTLIB += GeoIP bz2 c curses pthread z -MASTER_SITES = http://tar.goaccess.io/ +MASTER_SITES = https://tar.goaccess.io/ -LIB_DEPENDS = databases/tokyocabinet \ - net/GeoIP +LIB_DEPENDS = net/GeoIP CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --enable-geoip=legacy \ - --enable-utf8 \ - --enable-tcb=btree + --enable-utf8 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" + +FLAVORS = tokyocabinet +FLAVOR ?= + +.if ${FLAVOR:Mtokyocabinet} +WANTLIB += tokyocabinet +LIB_DEPENDS += databases/tokyocabinet +CONFIGURE_ARGS += --enable-tcb=btree +.endif do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/goaccess ${PREFIX}/bin/ Index: pkg/DESCR =================================================================== RCS file: /cvs/ports/www/goaccess/pkg/DESCR,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 DESCR --- pkg/DESCR 24 Oct 2013 01:59:44 -0000 1.1.1.1 +++ pkg/DESCR 12 Apr 2018 05:18:11 -0000 @@ -2,3 +2,12 @@ viewer that runs in a terminal in *nix systems. It provides fast and valuable HTTP statistics for system administrators that require a visual server report on the fly. + +Packages can be built with additional FLAVORs: + + tokyocabinet : Use this storage method for large datasets where it is not + possible to fit everything in memory. The B+ tree database is + slower than any of the hash databases since data has to be + committed to disk. However, using an SSD greatly increases the + performance. You may also use this storage method if you need + data persistence to quickly load statistics at a later date.
