系统日志输出支持json

client/internal/cmdline/sysevent.go

@@ -3,8 +3,10 @@ package cmdline
 import (
 	"context"
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
+	"gitlink.org.cn/cloudream/common/utils/serder"
 	"gitlink.org.cn/cloudream/storage/client/internal/config"
 	"gitlink.org.cn/cloudream/storage/common/pkgs/sysevent"
 )
@@ -16,16 +18,17 @@ func init() {
 
 	rootCmd.AddCommand(cmd)
 
+	outputJSON := rootCmd.Flags().BoolP("json", "j", false, "output in JSON format")
 	cmd.AddCommand(&cobra.Command{
 		Use:   "watch",
 		Short: "Watch system events",
 		Run: func(cmd *cobra.Command, args []string) {
-			watchSysEvent(GetCmdCtx(cmd))
+			watchSysEvent(*outputJSON)
 		},
 	})
 }
 
-func watchSysEvent(cmdCtx *CommandContext) {
+func watchSysEvent(outputJSON bool) {
 	host, err := sysevent.NewWatcherHost(sysevent.ConfigFromMQConfig(config.Cfg().RabbitMQ))
 	if err != nil {
 		fmt.Println(err)
@@ -34,7 +37,17 @@ func watchSysEvent(cmdCtx *CommandContext) {
 
 	ch := host.Start()
 	host.AddWatcherFn(func(event sysevent.SysEvent) {
-		fmt.Println(event.String())
+		if outputJSON {
+			data, err := serder.ObjectToJSON(event)
+			if err != nil {
+				fmt.Fprintf(os.Stderr, "serializing event: %v\n", err)
+				return
+			}
+
+			fmt.Println(string(data))
+		} else {
+			fmt.Println(event)
+		}
 	})
 	for {
 		e, err := ch.Receive().Wait(context.Background())
@@ -45,16 +58,16 @@ func watchSysEvent(cmdCtx *CommandContext) {
 
 		switch e := e.(type) {
 		case sysevent.PublishError:
-			fmt.Printf("Publish error: %v\n", e.Err)
+			fmt.Fprintf(os.Stderr, "Publish error: %v\n", e.Err)
 
 		case sysevent.PublisherExited:
 			if e.Err != nil {
-				fmt.Printf("Publisher exited with error: %v\n", e.Err)
+				fmt.Fprintf(os.Stderr, "Publisher exited with error: %v\n", e.Err)
 			}
 			return
 
 		case sysevent.OtherError:
-			fmt.Printf("Other error: %v\n", e.Err)
+			fmt.Fprintf(os.Stderr, "Other error: %v\n", e.Err)
 		}
 	}
 }