elastic · mipearson · Oct 19, 2014 · Oct 19, 2014 · Oct 19, 2014 · Oct 19, 2014
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,5 @@ logstash-forwarder
 *.DS_Store
 *.idea
 *.iml
+.ruby-version
+.bundle/
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,5 @@
-source :rubygems
+source "https://rubygems.org"
+
 gem "rspec"
 gem "insist"
 gem "stud"

diff --git a/Makefile b/Makefile
@@ -1,29 +1,20 @@
 VERSION=0.3.1
 
-# By default, all dependencies (zeromq, etc) will be downloaded and installed
-# locally. You can change this if you are deploying your own.
-#VENDOR?=zeromq libsodium
-VENDOR=
-
 # Where to install to.
 PREFIX?=/opt/logstash-forwarder
 
-FETCH=sh fetch.sh
 MAKE?=make
 CFLAGS+=-Ibuild/include
 LDFLAGS+=-Lbuild/lib -Wl,-rpath,'$$ORIGIN/../lib'
 
 default: build-all
 build-all: build/bin/logstash-forwarder build/bin/logstash-forwarder.sh
-#build-all: build/bin/keygen
-include Makefile.ext
 
 .PHONY: go-check
 go-check:
 	@go version > /dev/null || (echo "Go not found. You need to install go: http://golang.org/doc/install"; false)
 	@go version | grep -q 'go version go1.3' || (echo "Go version 1.3 required, you have a version of go that is unsupported. See http://golang.org/doc/install"; false)
 
-
 clean:
 	-@rm -fr build bin pkg
 
@@ -32,81 +23,32 @@ deps-clean:
 	rm -fr src/github.com/ugorji/go-msgpack
 	rm -fr src/github.com/alecthomas/gozmq
 
-vendor-clean:
-	$(MAKE) -C vendor/apr/ clean
-	$(MAKE) -C vendor/jansson/ clean
-	$(MAKE) -C vendor/jemalloc/ clean
-	$(MAKE) -C vendor/libsodium/ clean
-	$(MAKE) -C vendor/libuuid/ clean
-	$(MAKE) -C vendor/lz4/ clean
-	$(MAKE) -C vendor/msgpack/ clean
-	$(MAKE) -C vendor/openssl/ clean
-	$(MAKE) -C vendor/zeromq/ clean
-	$(MAKE) -C vendor/zlib/ clean
-
 rpm deb: PREFIX=/opt/logstash-forwarder
 rpm deb: | build-all
 	fpm -s dir -t $@ -n logstash-forwarder -v $(VERSION) \
 		--replaces lumberjack \
-		--exclude '*.a' --exclude 'lib/pkgconfig/zlib.pc' \
+		--exclude '*.a'\
 		--description "a log shipping tool" \
 		--url "https://github.com/elasticsearch/logstash-forwarder" \
 		build/bin/logstash-forwarder=$(PREFIX)/bin/ \
 		build/bin/logstash-forwarder.sh=$(PREFIX)/bin/ \
 		logstash-forwarder.init=/etc/init.d/logstash-forwarder
 
-# Vendor'd dependencies
-# If VENDOR contains 'zeromq' download and build it.
-ifeq ($(filter zeromq,$(VENDOR)),zeromq)
-build/bin/logstash-forwarder: | build/bin build/lib/libzmq.$(LIBEXT)
-pkg/linux_amd64/github.com/alecthomas/gozmq.a: | build/lib/libzmq.$(LIBEXT)
-src/github.com/alecthomas/gozmq/zmq.go: | build/lib/libzmq.$(LIBEXT)
-endif # zeromq
-
-ifeq ($(filter libsodium,$(VENDOR)),libsodium)
-build/bin/logstash-forwarder: | build/bin build/lib/libsodium.$(LIBEXT)
-build/bin/logstash-forwarder: | build/lib/pkgconfig/sodium.pc
-build/bin/keygen: | build/lib/pkgconfig/sodium.pc
-build/bin/keygen: | build/bin build/lib/libsodium.$(LIBEXT)
-endif # libsodium
-
 build/bin/logstash-forwarder.sh: logstash-forwarder.sh | build/bin
 	install -m 755 $^ $@
 
 build/bin/logstash-forwarder: | build/bin go-check
 	PKG_CONFIG_PATH=$$PWD/build/lib/pkgconfig \
 		go build -ldflags '-r $$ORIGIN/../lib' -v -o $@
-build/bin/keygen:  | build/bin go-check
-	PKG_CONFIG_PATH=$$PWD/build/lib/pkgconfig \
-		go install -ldflags '-r $$ORIGIN/../lib' -o $@
 
 # Mark these phony; 'go install' takes care of knowing how and when to rebuild.
-.PHONY: build/bin/keygen build/bin/logstash-forwarder
-
-build/lib/pkgconfig/sodium.pc: src/sodium/sodium.pc | build/lib/pkgconfig
-	cp $< $@
+.PHONY: build/bin/logstash-forwarder
 
 build/lib/pkgconfig: | build/lib
 	mkdir $@
 build/lib: | build
 	mkdir $@
 
-# gozmq
-src/github.com/alecthomas/gozmq/zmq.go: go-check
-	go get -d github.com/alecthomas/gozmq
-pkg/linux_amd64/github.com/alecthomas/gozmq.a: | build/lib/libzmq.$(LIBEXT)
-pkg/linux_amd64/github.com/alecthomas/gozmq.a: src/github.com/alecthomas/gozmq/zmq.go
-	PKG_CONFIG_PATH=$$PWD/build/lib/pkgconfig \
-	  go install -tags zmq_3_x github.com/alecthomas/gozmq
-
-build/include/zmq.h build/lib/libzmq.$(LIBEXT): | build/include build/lib
-	@echo " => Building zeromq"
-	PATH=$$PWD:$$PATH $(MAKE) -C vendor/zeromq/ install PREFIX=$$PWD/build DEBUG=$(DEBUG)
-
-build/include/sodium.h build/lib/libsodium.$(LIBEXT): | build
-	@echo " => Building libsodium"
-	PATH=$$PWD:$$PATH $(MAKE) -C vendor/libsodium/ install PREFIX=$$PWD/build DEBUG=$(DEBUG)
-
 build:
 	mkdir $@
 

diff --git a/Makefile.ext b/Makefile.ext
diff --git a/event.go b/event.go
diff --git a/fetch.sh b/fetch.sh
diff --git a/filecompare.go b/filecompare.go
diff --git a/filecompare_windows.go b/filecompare_windows.go
diff --git a/fileinfo_darwin.go b/fileinfo_darwin.go
diff --git a/fileinfo_linux.go b/fileinfo_linux.go
diff --git a/fileinfo_windows.go b/fileinfo_windows.go
diff --git a/filestate_darwin.go b/filestate_darwin.go
diff --git a/filestate_linux.go b/filestate_linux.go
diff --git a/filestate_windows.go b/filestate_windows.go
diff --git a/harvester.go b/harvester.go
@@ -174,8 +174,6 @@ func (h *Harvester) readline(reader *bufio.Reader, buffer *bytes.Buffer, eof_tim
 			return str, bufferSize, nil
 		}
 	} /* forever read chunks */
-
-	return nil, 0, nil
 }
 
 // panics
@@ -189,6 +187,6 @@ func mustBeRegularFile(f *os.File) {
 	}
 
 	if !info.Mode().IsRegular() {
-		panic(fmt.Errorf("Harvester: not a regular file:%q", info.Mode(), info.Name()))
+		panic(fmt.Errorf("Harvester: not a regular file: %q %q", info.Mode(), info.Name()))
 	}
 }
diff --git a/lib/lumberjack/server2.rb b/lib/lumberjack/server2.rb
diff --git a/logstash-forwarder.go b/logstash-forwarder.go
diff --git a/publisher1.go b/publisher1.go
@@ -217,7 +217,6 @@ func connect(config *NetworkConfig) (socket *tls.Conn) {
 		// connected, let's rock and roll.
 		return
 	}
-	return
 }
 
 func writeDataFrame(event *FileEvent, sequence uint32, output io.Writer) {

diff --git a/publisher1_test.go b/publisher1_test.go
diff --git a/registrar.go b/registrar.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"os"
 	"encoding/json"
+	"os"
 )
 
 func Registrar(state map[string]*FileState, input chan []*FileEvent) {

diff --git a/registrar_windows.go b/registrar_windows.go
diff --git a/spooler.go b/spooler.go