Format flow output as JSON when flag is specified

sahejsingh · Nov 1, 2019 · 75c5323 · 75c5323
1 parent 610850e
commit 75c5323
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/cmd/cnetflow/cnetflow.go b/cmd/cnetflow/cnetflow.go
@@ -54,17 +54,22 @@ func main() {
 
 	lvl, _ := log.ParseLevel(*LogLevel)
 	log.SetLevel(lvl)
+
+	var defaultTransport utils.Transport
+	defaultTransport = &utils.DefaultLogTransport{}
+
 	switch *LogFmt {
 	case "json":
 		log.SetFormatter(&log.JSONFormatter{})
+		defaultTransport = &utils.DefaultJSONTransport{}
 	}
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	log.Info("Starting GoFlow")
 
 	s := &utils.StateNetFlow{
-		Transport: &utils.DefaultLogTransport{},
+		Transport: defaultTransport,
 		Logger:    log.StandardLogger(),
 	}
 

diff --git a/cmd/cnflegacy/cnflegacy.go b/cmd/cnflegacy/cnflegacy.go
@@ -52,17 +52,22 @@ func main() {
 
 	lvl, _ := log.ParseLevel(*LogLevel)
 	log.SetLevel(lvl)
+
+	var defaultTransport utils.Transport
+	defaultTransport = &utils.DefaultLogTransport{}
+
 	switch *LogFmt {
 	case "json":
 		log.SetFormatter(&log.JSONFormatter{})
+		defaultTransport = &utils.DefaultJSONTransport{}
 	}
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	log.Info("Starting GoFlow")
 
 	s := &utils.StateNFLegacy{
-		Transport: &utils.DefaultLogTransport{},
+		Transport: defaultTransport,
 		Logger:    log.StandardLogger(),
 	}
 

diff --git a/cmd/csflow/csflow.go b/cmd/csflow/csflow.go
@@ -52,17 +52,22 @@ func main() {
 
 	lvl, _ := log.ParseLevel(*LogLevel)
 	log.SetLevel(lvl)
+
+	var defaultTransport utils.Transport
+	defaultTransport = &utils.DefaultLogTransport{}
+
 	switch *LogFmt {
 	case "json":
 		log.SetFormatter(&log.JSONFormatter{})
+		defaultTransport = &utils.DefaultJSONTransport{}
 	}
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	log.Info("Starting GoFlow")
 
 	s := &utils.StateSFlow{
-		Transport: &utils.DefaultLogTransport{},
+		Transport: defaultTransport,
 		Logger:    log.StandardLogger(),
 	}
 

diff --git a/cmd/goflow/goflow.go b/cmd/goflow/goflow.go
@@ -68,17 +68,20 @@ func main() {
 
 	lvl, _ := log.ParseLevel(*LogLevel)
 	log.SetLevel(lvl)
+
+	var defaultTransport utils.Transport
+	defaultTransport = &utils.DefaultLogTransport{}
+
 	switch *LogFmt {
 	case "json":
 		log.SetFormatter(&log.JSONFormatter{})
+		defaultTransport = &utils.DefaultJSONTransport{}
 	}
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
 	log.Info("Starting GoFlow")
 
-	defaultTransport := &utils.DefaultLogTransport{}
-
 	sSFlow := &utils.StateSFlow{
 		Transport: defaultTransport,
 		Logger:    log.StandardLogger(),