enable optional JSON log output

tomcz · tomcz · commit 6d54eb9c482d · 2021-06-14T06:31:27.000+10:00
diff --git a/README.md b/README.md
@@ -98,6 +98,7 @@ GLOBAL OPTIONS:
    --ldapPass value    OpenLDAP bind password (optional) [$LDAP_PASS]
    --interval value    Scrape interval (default: 30s) [$INTERVAL]
    --webCfgFile FILE   Prometheus metrics web config FILE (optional) [$WEB_CFG_FILE]
+   --jsonLog           Output logs in JSON format (default: false) [$JSON_LOG]
    --config YAML_FILE  Optional configuration from a YAML_FILE
    --help, -h          show help (default: false)
    --version, -v       print the version (default: false)
diff --git a/cmd/openldap_exporter/main.go b/cmd/openldap_exporter/main.go
@@ -23,6 +23,7 @@ const (
 	ldapPass   = "ldapPass"
 	interval   = "interval"
 	metrics    = "metrPath"
+	jsonLog    = "jsonLog"
 	webCfgFile = "webCfgFile"
 	config     = "config"
 )
@@ -74,6 +75,12 @@ func main() {
 			Usage:   "Prometheus metrics web config `FILE` (optional)",
 			EnvVars: []string{"WEB_CFG_FILE"},
 		}),
+		altsrc.NewBoolFlag(&cli.BoolFlag{
+			Name:    jsonLog,
+			Value:   false,
+			Usage:   "Output logs in JSON format",
+			EnvVars: []string{"JSON_LOG"},
+		}),
 		&cli.StringFlag{
 			Name:  config,
 			Usage: "Optional configuration from a `YAML_FILE`",
@@ -88,7 +95,6 @@ func main() {
 		Flags:           flags,
 		Action:          runMain,
 	}
-	log.Info("service starting")
 	if err := app.Run(os.Args); err != nil {
 		log.WithError(err).Fatal("service failed")
 	}
@@ -106,6 +112,13 @@ func optionalYamlSourceFunc(flagFileName string) func(context *cli.Context) (alt
 }
 
 func runMain(c *cli.Context) error {
+	if c.Bool(jsonLog) {
+		log.SetFormatter(&log.JSONFormatter{})
+	} else {
+		log.SetFormatter(&log.TextFormatter{})
+	}
+	log.Info("service starting")
+
 	server := exporter.NewMetricsServer(
 		c.String(promAddr),
 		c.String(metrics),
