From 53ed17449e990f49e8eecdf71ec3704ce7118660 Mon Sep 17 00:00:00 2001
From: Satoshi Tagomori <tagomoris@gmail.com>
Date: Tue, 18 Oct 2016 10:55:30 +0900
Subject: [PATCH] Update fluent-logger-golang to v1.2.1

This fixes a regression bug not to connect the destination node twice or more.
That regression was brought by v1.2.0, and it also makes many goroutines for
first reconnection (these will finish after first reconnection established).

Signed-off-by: Satoshi Tagomori <tagomoris@gmail.com>
---
 hack/vendor.sh                                                | 2 +-
 .../github.com/fluent/fluent-logger-golang/fluent/fluent.go   | 4 ++--
 .../github.com/fluent/fluent-logger-golang/fluent/version.go  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hack/vendor.sh b/hack/vendor.sh
index 7897e84f2c..0c562d1bfc 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -118,7 +118,7 @@ clone git github.com/golang/protobuf 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a
 # gelf logging driver deps
 clone git github.com/Graylog2/go-gelf aab2f594e4585d43468ac57287b0dece9d806883
 
-clone git github.com/fluent/fluent-logger-golang v1.2.0
+clone git github.com/fluent/fluent-logger-golang v1.2.1
 # fluent-logger-golang deps
 clone git github.com/philhofer/fwd 899e4efba8eaa1fea74175308f3fae18ff3319fa
 clone git github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c
diff --git a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go
index 7363fa3f1e..655f6233ca 100644
--- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go
+++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/fluent.go
@@ -78,7 +78,7 @@ func New(config Config) (f *Fluent, err error) {
 	}
 	if config.AsyncConnect {
 		f = &Fluent{Config: config, reconnecting: true}
-		f.reconnect()
+		go f.reconnect()
 	} else {
 		f = &Fluent{Config: config, reconnecting: false}
 		err = f.connect()
@@ -254,7 +254,7 @@ func (f *Fluent) connect() (err error) {
 		err = net.UnknownNetworkError(f.Config.FluentNetwork)
 	}
 
-	if err != nil {
+	if err == nil {
 		f.reconnecting = false
 	}
 	return
diff --git a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go
index 3d8ad3ee11..8904726ddb 100644
--- a/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go
+++ b/vendor/src/github.com/fluent/fluent-logger-golang/fluent/version.go
@@ -1,3 +1,3 @@
 package fluent
 
-const Version = "1.1.0"
+const Version = "1.2.1"