Skip to content
Merged

Sort #21

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
11 changes: 9 additions & 2 deletions logging_cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
"fmt"
"log"
"os"
"sort"
"time"

"github.com/brotherlogic/goserver/utils"
"google.golang.org/grpc"
Expand All @@ -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)
}
Expand All @@ -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)
}
}
2 changes: 1 addition & 1 deletion loggingutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down