Merge branch 'master' into anton-bugfix-libvirt-collector

Author: antongulenko

Dockerfile

@@ -4,10 +4,7 @@ ENV GO111MODULE=on
 RUN apk --no-cache add git gcc g++ libvirt-dev libvirt-common-drivers libpcap-dev
 WORKDIR /build
 COPY . .
-
-# TODO this workaround should not be necessary
-RUN rm go.sum
-
+RUN rm go.sum # TODO HACK
 RUN go build -o /bitflow-collector ./bitflow-collector
 
 FROM alpine:3.9

bitflow-collector/main.go

@@ -25,7 +25,7 @@ func do_main() int {
 	helper.RegisterFlags()
 	_, args := cmd.ParseFlags()
 	if len(args) > 0 {
-		golib.Fatalln("Stray command line argument(s):", args)
+		log.Fatalln("Stray command line argument(s):", args)
 	}
 	defer golib.ProfileCpu()()
 

go.mod

@@ -2,8 +2,8 @@ module github.com/bitflow-stream/go-bitflow-collector
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
-	github.com/antongulenko/golib v0.0.10
-	github.com/bitflow-stream/go-bitflow v0.0.28
+	github.com/antongulenko/golib v0.0.11
+	github.com/bitflow-stream/go-bitflow v0.0.29
 	github.com/cenk/hub v1.0.0 // indirect
 	github.com/cenkalti/hub v1.0.0-20160327091400-11382a9960d39b0ecda16fd01c424c11ff765a34 // indirect
 	github.com/cenkalti/rpc2 v0.0.0-20180727162946-9642ea02d0aa // indirect

go.sum

@@ -8,10 +8,14 @@ github.com/antongulenko/go-onlinestats v0.0.0-20160514060630-5ff69410145c/go.mod
 github.com/antongulenko/golearn v0.0.0-20180917161504-d3c9efc653e9/go.mod h1:ISOuvVjm+Gs4yqKZoCO9RbAGrrJVf4FyyK1G2ugEEiQ=
 github.com/antongulenko/golib v0.0.10 h1:FJdaY9llzoaoTenPp30zqN1if+MhGNc9/F1l/jmIWkc=
 github.com/antongulenko/golib v0.0.10/go.mod h1:uAGlOSer3qSjgim4PvzoTb97ZtG9BEwH+nr5yjlVZ0M=
+github.com/antongulenko/golib v0.0.11 h1:AB2FGcncdxP2E0P4b+bolCd0HDHse1Dn7vS4j3iIbFE=
+github.com/antongulenko/golib v0.0.11/go.mod h1:uAGlOSer3qSjgim4PvzoTb97ZtG9BEwH+nr5yjlVZ0M=
 github.com/antongulenko/goterm v0.0.3 h1:ggti0j41NgsbrXYol4x+UMKOr7Pfg6ttFvfy5d1d2W8=
 github.com/antongulenko/goterm v0.0.3/go.mod h1:6oWLrlayrVujfKUWrbsBQT3aKilCnnzfhfJcR3LpAWo=
 github.com/bitflow-stream/go-bitflow v0.0.28 h1:oDTC0yoY+GCW4Utw9V60c4fcsaX5IrmDh1mItXj8dlM=
 github.com/bitflow-stream/go-bitflow v0.0.28/go.mod h1:Wp5TiebnHYbMnAnTxBxHPtJAhcOuuCNkuBAC0ApzLnA=
+github.com/bitflow-stream/go-bitflow v0.0.29 h1:Tqxnqxv3ZrIpceDKc9GCKpjZb4gkh2GygzsNUCWCGl0=
+github.com/bitflow-stream/go-bitflow v0.0.29/go.mod h1:FYP2oczEckNYguNHS2TXLey6fdiH1D2shvfo44z4ZOY=
 github.com/bugsnag/bugsnag-go v1.5.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/cenk/hub v1.0.0/go.mod h1:rJM1LNAW0ppT8FMMuPK6c2NP/R2nH/UthtuRySSaf6Y=
 github.com/cenkalti/hub v1.0.0-20160327091400-11382a9960d39b0ecda16fd01c424c11ff765a34 h1:hpJ2LUJWQ3vXzh+KzD2nfhjXqHn0Z3gf7oKzq0YWXsM=

pcap/trace-connections/main.go

@@ -43,7 +43,7 @@ func traceConnections(nics ...string) {
 		if captureErr, ok := err.(pcap.CaptureError); ok {
 			log.Warnln("Capture error:", captureErr)
 		} else {
-			golib.Fatalln(err)
+			log.Fatalln(err)
 		}
 	})