diff --git a/logging.go b/logging.go index a72d2461c..dc7c84f43 100644 --- a/logging.go +++ b/logging.go @@ -94,7 +94,7 @@ func main() { server.PrepServer() server.Register = server - err := server.RegisterServerV2("logging", false, true) + err := server.RegisterServerV2("logging", false, false) if err != nil { return } diff --git a/logging_cli/cli.go b/logging_cli/cli.go index 30f47ebcf..ebbd6a9f6 100644 --- a/logging_cli/cli.go +++ b/logging_cli/cli.go @@ -4,6 +4,8 @@ import ( "fmt" "log" "os" + "sort" + "time" "github.com/brotherlogic/goserver/utils" "google.golang.org/grpc" @@ -17,7 +19,7 @@ func init() { } func main() { - conn, err := grpc.Dial("discovery:///recordadder", grpc.WithInsecure(), grpc.WithBalancerName("my_pick_first")) + conn, err := grpc.Dial("discovery:///logging", grpc.WithInsecure(), grpc.WithBalancerName("my_pick_first")) if err != nil { log.Fatalf("Dial error: %v", err) } @@ -32,12 +34,17 @@ func main() { logs := []*pb.Log{} for err == nil { res, err = client.GetLogs(ctx, &pb.GetLogsRequest{Origin: os.Args[1]}) + fmt.Printf("%v\n", err) if err == nil { logs = append(logs, res.GetLogs()...) } } + sort.SliceStable(logs, func(i, j int) bool { + return logs[i].GetTimestamp() > logs[j].GetTimestamp() + }) + for _, l := range logs { - fmt.Printf("%v\n", l) + fmt.Printf("%v - %v\n", time.Unix(l.GetTimestamp(), 0), l) } } diff --git a/loggingutils.go b/loggingutils.go index f9e55d8a5..c9eb5a27a 100644 --- a/loggingutils.go +++ b/loggingutils.go @@ -57,7 +57,7 @@ func (s *Server) loadAllLogs(ctx context.Context, origin string) ([]*pb.Log, err }) sort.SliceStable(logs, func(i, j int) bool { - return logs[i].GetTimestamp() < logs[j].GetTimestamp() + return logs[i].GetTimestamp() > logs[j].GetTimestamp() }) // Only return 20 logs