Skip to content

Commit bc2b638

Browse files
Log userID when using syncMembershipIn to better differentiate checks (#879)
Spawning from staring at some logs and wanting to know which user this pertains to without having to dive into the test source: ``` federation_rooms_invite_test.go:151: @user-58-alice:hs1 MustSyncUntil: timed out after 5.441786693s. Seen 6 /sync responses. Checkers: [t=391.995078ms] Response #1: syncMembershipIn(!nQhJEXkKJaajxcXaif:hs1, leave): check function did not pass while iterating ... ```
1 parent f4cff9e commit bc2b638

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

client/sync.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ func syncMembershipIn(userID, roomID, membership string, checks ...func(gjson.Re
347347
} else if membership == "knock" {
348348
roomTypeKey = "knock"
349349
} else {
350-
return fmt.Errorf("syncMembershipIn(%s, %s): unknown membership: %s", roomID, membership, membership)
350+
return fmt.Errorf("syncMembershipIn(%s, %s, %s): unknown membership: %s", userID, roomID, membership, membership)
351351
}
352352
}
353353

@@ -363,7 +363,7 @@ func syncMembershipIn(userID, roomID, membership string, checks ...func(gjson.Re
363363
} else if membership == "knock" {
364364
stateKey = "knock_state"
365365
} else {
366-
return fmt.Errorf("syncMembershipIn(%s, %s): unknown membership: %s", roomID, membership, membership)
366+
return fmt.Errorf("syncMembershipIn(%s, %s, %s): unknown membership: %s", userID, roomID, membership, membership)
367367
}
368368
}
369369

@@ -399,7 +399,7 @@ func syncMembershipIn(userID, roomID, membership string, checks ...func(gjson.Re
399399
}
400400
}
401401

402-
return fmt.Errorf("syncMembershipIn(%s, %s): %s & %s - %s", roomID, membership, firstErr, secondErr, topLevelSyncJSON)
402+
return fmt.Errorf("syncMembershipIn(%s, %s, %s): %s & %s - %s", userID, roomID, membership, firstErr, secondErr, topLevelSyncJSON)
403403
}
404404
}
405405

0 commit comments

Comments
 (0)