Name change and bug fix (#27)

* update plugin name to offical name

* fix timeout issue for event batching

Author: sharonx

.dockerignore

@@ -1,2 +1,2 @@
 .git
-splunk-log-plugin
+splunk-logging-plugin

.gitignore

@@ -1,5 +1,5 @@
-splunk-log-plugin
-splunk-log-plugin.tar.gz
+splunk-logging-plugin
+splunk-logging-plugin.tar.gz
 .idea/
 .DS_Store
 *.pyc

Dockerfile

@@ -1,16 +1,16 @@
 FROM  golang:1.9.2
 
-WORKDIR /go/src/github.com/splunk/splunk-log-plugin/
+WORKDIR /go/src/github.com/splunk/splunk-logging-plugin/
 
-COPY . /go/src/github.com/splunk/splunk-log-plugin/
+COPY . /go/src/github.com/splunk/splunk-logging-plugin/
 
 
-RUN cd /go/src/github.com/splunk/splunk-log-plugin && go get
+RUN cd /go/src/github.com/splunk/splunk-logging-plugin && go get
 
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /bin/splunk-log-plugin .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /bin/splunk-logging-plugin .
 
 FROM alpine:3.7
 RUN apk --no-cache add ca-certificates
-COPY --from=0 /bin/splunk-log-plugin /bin/
+COPY --from=0 /bin/splunk-logging-plugin /bin/
 WORKDIR /bin/
-ENTRYPOINT [ "/bin/splunk-log-plugin" ]
+ENTRYPOINT [ "/bin/splunk-logging-plugin" ]

Makefile

@@ -1,6 +1,6 @@
-PLUGIN_NAME=splunk-log-plugin
+PLUGIN_NAME=splunk/docker-logging-plugin
 PLUGIN_TAG=latest
-PLUGIN_DIR=./splunk-log-plugin
+PLUGIN_DIR=./splunk-logging-plugin
 
 all: clean docker rootfs create
 package: clean docker rootfs zip
@@ -10,7 +10,7 @@ clean:
 	rm -rf ${PLUGIN_DIR}
 
 docker:
-	@echo "### docker build: rootfs image with splunk-log-plugin"
+	@echo "### docker build: rootfs image with splunk-logging-plugin"
 	docker build -t ${PLUGIN_NAME}:rootfs .
 
 rootfs:

config.json

@@ -1,7 +1,7 @@
 {
 	"description": "Splunk Logging Plugin",
 	"documentation": "https://github.com/splunk/docker-logging-plugin",
-	"entrypoint": ["/bin/splunk-log-plugin"],
+	"entrypoint": ["/bin/splunk-logging-plugin"],
     "network": {
         "type": "host"
     },

splunk_logger.go

@@ -490,13 +490,14 @@ Do a HEC POST when
 - time out
 */
 func (l *splunkLogger) worker() {
-	timer := time.NewTicker(l.hec.postMessagesFrequency)
 	var messages []*splunkMessage
 	for {
+		timer := time.NewTicker(l.hec.postMessagesFrequency)
 		select {
 		case message, open := <-l.stream:
 			// if the stream channel is closed, post the remaining messages in the buffer
 			if !open {
+				logrus.Debugf("stream is closed with %d events", len(messages))
 				l.hec.postMessages(messages, true)
 				l.lock.Lock()
 				defer l.lock.Unlock()
@@ -513,6 +514,7 @@ func (l *splunkLogger) worker() {
 				messages = l.hec.postMessages(messages, false)
 			}
 		case <-timer.C:
+			logrus.Debugf("messages buffer timeout, sending %d events", len(messages))
 			messages = l.hec.postMessages(messages, false)
 		}
 	}