From 3915fa6b921f882d1855d873b43e7e3b3b063f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Mej=C3=ADas=20Rodr=C3=ADguez?=
 <juan.mejias@reduc.edu.cu>
Date: Sat, 17 Aug 2019 16:08:57 -0400
Subject: [PATCH] Add json format to logs

---
 CHANGELOG.md |  1 +
 Dockerfile   |  1 +
 cmd/root.go  | 15 +++++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e28feff..bee2f54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `-A, --auth-token` global flag to set Portainer auth token.
 - `--config` global flag to set the path to a configuration file. Supported file formats are JSON, TOML, YAML, HCL, envfile and Java properties config files. Defaults to "$HOME/.psu.yaml".
 - `-h, --help` global flag to print global help.
+- `--log-format` global flag to set log format from "text" and "json". Defaults to "text".
 - `-v, --log-level` global flag to set log level from "panic", "faltal", "error", "warning", "info", "debug" and "trace". Defaults to "info".
 - `--password` long name for `-p` global flag.
 - `-t, --timeout` global flag to set a timeout for requests execution.
diff --git a/Dockerfile b/Dockerfile
index 45f5069..518f988 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ ENV PSU_AUTH_TOKEN="" \
   PSU_ENDPOINT_GROUP_LIST_FORMAT="" \
   PSU_ENDPOINT_LIST_FORMAT="" \
   PSU_INSECURE="" \
+  PSU_LOG_FORMAT="" \
   PSU_LOG_LEVEL="" \
   PSU_LOGIN_PRINT="" \
   PSU_PASSWORD="" \
diff --git a/cmd/root.go b/cmd/root.go
index 850a16d..a8e0e09 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -40,6 +40,7 @@ func init() {
 
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "Config file. (default \"$HOME/.psu.yaml)\"")
 	rootCmd.PersistentFlags().StringP("log-level", "v", "info", "Log level. One of trace, debug, info, warning, error, fatal or panic.")
+	rootCmd.PersistentFlags().String("log-format", "text", "Log format. One of text or json.")
 	rootCmd.PersistentFlags().BoolP("insecure", "i", false, "Skip Portainer SSL certificate verification.")
 	rootCmd.PersistentFlags().StringP("url", "l", "", "Portainer url.")
 	rootCmd.PersistentFlags().StringP("user", "u", "", "Portainer user.")
@@ -48,6 +49,7 @@ func init() {
 	rootCmd.PersistentFlags().DurationP("timeout", "t", 0, "Waiting time before aborting (like 100ms, 30s, 1h20m).")
 	viper.BindPFlag("config", rootCmd.PersistentFlags().Lookup("config"))
 	viper.BindPFlag("log-level", rootCmd.PersistentFlags().Lookup("log-level"))
+	viper.BindPFlag("log-format", rootCmd.PersistentFlags().Lookup("log-format"))
 	viper.BindPFlag("insecure", rootCmd.PersistentFlags().Lookup("insecure"))
 	viper.BindPFlag("url", rootCmd.PersistentFlags().Lookup("url"))
 	viper.BindPFlag("timeout", rootCmd.PersistentFlags().Lookup("timeout"))
@@ -95,4 +97,17 @@ func initLogger() {
 		logrus.SetLevel(logrus.InfoLevel)
 	}
 	logrus.SetLevel(logLevel)
+
+	switch viper.GetString("log-format") {
+	case "json":
+		logrus.SetFormatter(&logrus.JSONFormatter{})
+	case "text":
+		logrus.SetFormatter(&logrus.TextFormatter{})
+	default:
+		logrus.WithFields(logrus.Fields{
+			"format":       viper.GetString("log-format"),
+			"implications": `Default text format will be used instead`,
+		}).Warning("Unknown log format")
+		logrus.SetFormatter(&logrus.TextFormatter{})
+	}
 }