mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-07 23:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use fmt. instead of log.

Browse source
This commit is contained in:
Till Faelligen 2023-10-05 09:41:31 +02:00
parent 21bdd9cf77
commit 2f24fffc89
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cmd/resolve-state/main.go
View file

@ -3,7 +3,7 @@ package main
import ( import (
"context" "context"
"flag" "flag"
"log" "fmt"
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
@ -58,7 +58,7 @@ func main() {
args := flag.Args() args := flag.Args()
log.Println("Room version", *roomVersion) fmt.Println("Room version", *roomVersion)
snapshotNIDs := []types.StateSnapshotNID{} snapshotNIDs := []types.StateSnapshotNID{}
for _, arg := range args { for _, arg := range args {
@ -75,7 +75,7 @@ func main() {
dbOpts = cfg.Global.DatabaseOptions dbOpts = cfg.Global.DatabaseOptions
} }
log.Println("Opening database") fmt.Println("Opening database")
roomserverDB, err := storage.Open( roomserverDB, err := storage.Open(
processCtx.Context(), cm, &dbOpts, processCtx.Context(), cm, &dbOpts,
caching.NewRistrettoCache(8*1024*1024, time.Minute*5, false), caching.NewRistrettoCache(8*1024*1024, time.Minute*5, false),
@ -91,7 +91,7 @@ func main() {
} }
stateres := state.NewStateResolution(roomserverDB, roomInfo, rsAPI) stateres := state.NewStateResolution(roomserverDB, roomInfo, rsAPI)
log.Println("Fetching", len(snapshotNIDs), "snapshot NIDs") fmt.Println("Fetching", len(snapshotNIDs), "snapshot NIDs")
if *difference { if *difference {
if len(snapshotNIDs) != 2 { if len(snapshotNIDs) != 2 {
@ -125,26 +125,26 @@ func main() {
} }
if len(removed) > 0 { if len(removed) > 0 {
log.Println("Removed:") fmt.Println("Removed:")
for _, r := range removed { for _, r := range removed {
event := events[r.EventNID] event := events[r.EventNID]
log.Println() fmt.Println()
log.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey()) fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
log.Printf(" %s\n", string(event.Content())) fmt.Printf(" %s\n", string(event.Content()))
} }
} }
if len(removed) > 0 && len(added) > 0 { if len(removed) > 0 && len(added) > 0 {
log.Println() fmt.Println()
} }
if len(added) > 0 { if len(added) > 0 {
log.Println("Added:") fmt.Println("Added:")
for _, a := range added { for _, a := range added {
event := events[a.EventNID] event := events[a.EventNID]
log.Println() fmt.Println()
log.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey()) fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
log.Printf(" %s\n", string(event.Content())) fmt.Printf(" %s\n", string(event.Content()))
} }
} }
@ -171,7 +171,7 @@ func main() {
eventNIDs = append(eventNIDs, eventNID) eventNIDs = append(eventNIDs, eventNID)
} }
log.Println("Fetching", len(eventNIDMap), "state events") fmt.Println("Fetching", len(eventNIDMap), "state events")
eventEntries, err := roomserverDB.Events(ctx, roomInfo.RoomVersion, eventNIDs) eventEntries, err := roomserverDB.Events(ctx, roomInfo.RoomVersion, eventNIDs)
if err != nil { if err != nil {
panic(err) panic(err)
@ -191,7 +191,7 @@ func main() {
authEventIDs = append(authEventIDs, authEventID) authEventIDs = append(authEventIDs, authEventID)
} }
log.Println("Fetching", len(authEventIDs), "auth events") fmt.Println("Fetching", len(authEventIDs), "auth events")
authEventEntries, err := roomserverDB.EventsFromIDs(ctx, roomInfo, authEventIDs) authEventEntries, err := roomserverDB.EventsFromIDs(ctx, roomInfo, authEventIDs)
if err != nil { if err != nil {
panic(err) panic(err)
@ -202,7 +202,7 @@ func main() {
authEvents[i] = authEventEntries[i].PDU authEvents[i] = authEventEntries[i].PDU
} }
log.Println("Resolving state") fmt.Println("Resolving state")
var resolved Events var resolved Events
resolved, err = gomatrixserverlib.ResolveConflicts( resolved, err = gomatrixserverlib.ResolveConflicts(
gomatrixserverlib.RoomVersion(*roomVersion), events, authEvents, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) { gomatrixserverlib.RoomVersion(*roomVersion), events, authEvents, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) {
@ -213,7 +213,7 @@ func main() {
panic(err) panic(err)
} }
log.Println("Resolved state contains", len(resolved), "events") fmt.Println("Resolved state contains", len(resolved), "events")
sort.Sort(resolved) sort.Sort(resolved)
filteringEventType := *filterType filteringEventType := *filterType
count := 0 count := 0
@ -222,13 +222,13 @@ func main() {
continue continue
} }
count++ count++
log.Println() fmt.Println()
log.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey()) fmt.Printf("* %s %s %q\n", event.EventID(), event.Type(), *event.StateKey())
log.Printf(" %s\n", string(event.Content())) fmt.Printf(" %s\n", string(event.Content()))
} }
log.Println() fmt.Println()
log.Println("Returned", count, "state events after filtering") fmt.Println("Returned", count, "state events after filtering")
} }
type Events []gomatrixserverlib.PDU type Events []gomatrixserverlib.PDU