Merge pull request #36 from cobaltcore-dev/log-pretty-print

config: add log-pretty-print flag for JSON pretty print

Author: kayrus

pkg/commands/producer_ops_log.go

@@ -22,6 +22,7 @@ var (
 	opsNatsSubject             string
 	opsNatsMetricsSubject      string
 	opsLogToStdout             bool
+	opsLogPrettyPrint          bool
 	opsLogRetentionDays        int
 	opsMaxLogFileSize          int64
 	opsPromEnabled             bool
@@ -128,6 +129,7 @@ Following this configuration change, the RadosGW will log operations to the file
 			NatsSubject:               opsNatsSubject,
 			NatsMetricsSubject:        opsNatsMetricsSubject,
 			LogToStdout:               opsLogToStdout,
+			LogPrettyPrint:            opsLogPrettyPrint,
 			LogRetentionDays:          opsLogRetentionDays,
 			MaxLogFileSize:            opsMaxLogFileSize,
 			Prometheus:                opsPromEnabled,
@@ -232,6 +234,10 @@ Following this configuration change, the RadosGW will log operations to the file
 			event.Bool("log_to_stdout", config.LogToStdout)
 		}
 
+		if config.LogPrettyPrint {
+			event.Bool("log_pretty_print", config.LogPrettyPrint)
+		}
+
 		event.Int("log_retention_days", config.LogRetentionDays)
 		event.Int64("max_log_file_size", config.MaxLogFileSize)
 
@@ -530,6 +536,7 @@ func mergeOpsLogConfigWithEnv(cfg opslog.OpsLogConfig) opslog.OpsLogConfig {
 	cfg.NatsSubject = getEnv("NATS_SUBJECT", cfg.NatsSubject)
 	cfg.NatsMetricsSubject = getEnv("NATS_METRICS_SUBJECT", cfg.NatsMetricsSubject)
 	cfg.LogToStdout = getEnvBool("LOG_TO_STDOUT", cfg.LogToStdout)
+	cfg.LogPrettyPrint = getEnvBool("LOG_PRETTY_PRINT", cfg.LogPrettyPrint)
 	cfg.LogRetentionDays = getEnvInt("LOG_RETENTION_DAYS", cfg.LogRetentionDays)
 	cfg.MaxLogFileSize = getEnvInt64("MAX_LOG_FILE_SIZE", cfg.MaxLogFileSize)
 	cfg.PrometheusPort = getEnvInt("PROMETHEUS_PORT", cfg.PrometheusPort)
@@ -618,6 +625,7 @@ func init() {
 	opsLogCmd.Flags().StringVar(&opsNatsSubject, "nats-subject", "rgw.s3.ops", "NATS subject to publish results")
 	opsLogCmd.Flags().StringVar(&opsNatsMetricsSubject, "nats-metrics-subject", "rgw.s3.ops.aggregated.metrics", "NATS subject to publish aggregated metrics")
 	opsLogCmd.Flags().BoolVar(&opsLogToStdout, "log-to-stdout", false, "Log operations to stdout instead of a file")
+	opsLogCmd.Flags().BoolVar(&opsLogPrettyPrint, "log-pretty-print", false, "Enable pretty printing for log output")
 	opsLogCmd.Flags().IntVar(&opsLogRetentionDays, "log-retention-days", 1, "Number of days to retain old log files")
 	opsLogCmd.Flags().Int64Var(&opsMaxLogFileSize, "max-log-file-size", 10, "Maximum log file size in MB before rotation (e.g., 10 for 10 MB)")
 	opsLogCmd.Flags().BoolVar(&opsPromEnabled, "prometheus", false, "Enable Prometheus metrics")

pkg/producers/opslog/config.go

@@ -13,6 +13,7 @@ type OpsLogConfig struct {
 	NatsMetricsSubject        string
 	UseNats                   bool
 	LogToStdout               bool
+	LogPrettyPrint            bool
 	LogRetentionDays          int   // Number of days to keep old log files
 	MaxLogFileSize            int64 // Maximum log file size in bytes before rotation
 	Prometheus                bool

pkg/producers/opslog/opslog.go

@@ -263,7 +263,14 @@ func processLogEntries(cfg OpsLogConfig, nc *nats.Conn, watcher *fsnotify.Watche
 
 		// Print to stdout if enabled
 		if cfg.LogToStdout {
-			if b, err := json.MarshalIndent(logEntry, "", "  "); err == nil {
+			var b []byte
+			var err error
+			if cfg.LogPrettyPrint {
+				b, err = json.MarshalIndent(logEntry, "", "  ")
+			} else {
+				b, err = json.Marshal(logEntry)
+			}
+			if err == nil {
 				fmt.Println(string(b))
 			}
 		}
@@ -380,13 +387,18 @@ func handleConnection(cfg OpsLogConfig, conn net.Conn, nc *nats.Conn, metrics *M
 
 		// Conditional logging to stdout if enabled
 		if cfg.LogToStdout {
-			logEntryBytes, err := json.Marshal(logEntry)
-			// logEntryBytes, err := json.MarshalIndent(logEntry, "", "  ")
+			var b []byte
+			var err error
+			if cfg.LogPrettyPrint {
+				b, err = json.MarshalIndent(logEntry, "", "  ")
+			} else {
+				b, err = json.Marshal(logEntry)
+			}
 			if err != nil {
 				log.Error().Err(err).Msg("Error marshalling log entry for stdout")
 				continue
 			}
-			fmt.Println(string(logEntryBytes)) // Print log entry to stdout
+			fmt.Println(string(b)) // Print log entry to stdout
 		}
 
 		// Publish the individual log entry to NATS or print locally