add fluent socket option

koid · Jun 22, 2018 · b63f8c9 · b63f8c9
1 parent de27cad
commit b63f8c9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/fluentd.example.conf b/fluentd.example.conf
@@ -1,3 +1,6 @@
+<source>
+  @type unix
+</source>
 <source>
   @type forward
 </source>

diff --git a/main.go b/main.go
@@ -26,8 +26,9 @@ var (
 	checkpointTablePrefix string
 	tagKey                string
 
-	fluentHost = "localhost"
-	fluentPort = 24224
+	fluentSocket string
+	fluentHost   = "localhost"
+	fluentPort   = 24224
 
 	dogStatsdAddr string
 	dogStatsdTags []string
@@ -46,7 +47,8 @@ func init() {
 	}
 
 	tagKey = os.Getenv("TAG_KEY")
-
+
+	fluentSocket = os.Getenv("FLUENT_SOCKET")
 	if len(os.Getenv("FLUENT_HOST")) != 0 {
 		fluentHost = os.Getenv("FLUENT_HOST")
 	}
@@ -67,11 +69,22 @@ func init() {
 }
 
 func initFluentLogger(retry int) *fluent.Fluent {
-	_l, err := fluent.New(fluent.Config{
-		MarshalAsJSON: true,
-		FluentHost:    fluentHost,
-		FluentPort:    fluentPort,
-	})
+	var cfg fluent.Config
+	if len(fluentSocket) > 0 {
+		cfg = fluent.Config{
+			MarshalAsJSON:    true,
+			FluentNetwork:    "unix",
+			FluentSocketPath: fluentSocket,
+		}
+	} else {
+		cfg = fluent.Config{
+			MarshalAsJSON: true,
+			FluentHost:    fluentHost,
+			FluentPort:    fluentPort,
+		}
+	}
+
+	_l, err := fluent.New(cfg)
 	if err != nil {
 		if retry == 0 {
 			log.Fatalf("fluent.New returned error: %v", err)