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

Fix up vetshadow warnings

Browse source
This commit is contained in:
Erik Johnston 2017-09-05 16:07:29 +01:00
parent 43cfe50bcf
commit dcdf7d4ea3
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/cmd/dendrite-monolith-server/main.go
View file

@ -197,7 +197,6 @@ func (m *monolith) setupFederation() {
} }
func (m *monolith) setupKafka() { func (m *monolith) setupKafka() {
var err error
if m.cfg.Kafka.UseNaffka { if m.cfg.Kafka.UseNaffka {
naff, err := naffka.New(&naffka.MemoryDatabase{}) naff, err := naffka.New(&naffka.MemoryDatabase{})
if err != nil { if err != nil {
@ -208,6 +207,7 @@ func (m *monolith) setupKafka() {
m.naffka = naff m.naffka = naff
m.kafkaProducer = naff m.kafkaProducer = naff
} else { } else {
var err error
m.kafkaProducer, err = sarama.NewSyncProducer(m.cfg.Kafka.Addresses, nil) m.kafkaProducer, err = sarama.NewSyncProducer(m.cfg.Kafka.Addresses, nil)
if err != nil { if err != nil {
log.WithFields(log.Fields{ log.WithFields(log.Fields{

4
src/github.com/matrix-org/dendrite/cmd/roomserver-integration-tests/main.go
View file

@ -221,14 +221,14 @@ func testRoomserver(input []string, wantOutput []string, checkQueries func(api.R
if err != nil { if err != nil {
panic(err) panic(err)
} }
if err := test.WriteConfig(cfg, dir); err != nil { if err = test.WriteConfig(cfg, dir); err != nil {
panic(err) panic(err)
} }
outputTopic := string(cfg.Kafka.Topics.OutputRoomEvent) outputTopic := string(cfg.Kafka.Topics.OutputRoomEvent)
exe.DeleteTopic(outputTopic) exe.DeleteTopic(outputTopic)
if err := exe.CreateTopic(outputTopic); err != nil { if err = exe.CreateTopic(outputTopic); err != nil {
panic(err) panic(err)
} }

8
src/github.com/matrix-org/dendrite/roomserver/input/latest_events.go
View file

@ -99,14 +99,14 @@ type latestEventsUpdater struct {
} }
func (u *latestEventsUpdater) doUpdateLatestEvents() error { func (u *latestEventsUpdater) doUpdateLatestEvents() error {
var err error
var prevEvents []gomatrixserverlib.EventReference var prevEvents []gomatrixserverlib.EventReference
prevEvents = u.event.PrevEvents() prevEvents = u.event.PrevEvents()
oldLatest := u.updater.LatestEvents() oldLatest := u.updater.LatestEvents()
u.lastEventIDSent = u.updater.LastEventIDSent() u.lastEventIDSent = u.updater.LastEventIDSent()
u.oldStateNID = u.updater.CurrentStateSnapshotNID() u.oldStateNID = u.updater.CurrentStateSnapshotNID()
if hasBeenSent, err := u.updater.HasEventBeenSent(u.stateAtEvent.EventNID); err != nil { hasBeenSent, err := u.updater.HasEventBeenSent(u.stateAtEvent.EventNID)
if err != nil {
return err return err
} else if hasBeenSent { } else if hasBeenSent {
// Already sent this event so we can stop processing // Already sent this event so we can stop processing
@ -119,8 +119,8 @@ func (u *latestEventsUpdater) doUpdateLatestEvents() error {
eventReference := u.event.EventReference() eventReference := u.event.EventReference()
// Check if this event is already referenced by another event in the room. // Check if this event is already referenced by another event in the room.
var alreadyReferenced bool alreadyReferenced, err := u.updater.IsReferenced(eventReference)
if alreadyReferenced, err = u.updater.IsReferenced(eventReference); err != nil { if err != nil {
return err return err
} }

14
src/github.com/matrix-org/dendrite/syncapi/sync/notifier.go
View file

@ -67,7 +67,7 @@ func (n *Notifier) OnNewEvent(ev *gomatrixserverlib.Event, userID string, pos ty
userIDs := n.joinedUsers(ev.RoomID()) userIDs := n.joinedUsers(ev.RoomID())
// If this is an invite, also add in the invitee to this list. // If this is an invite, also add in the invitee to this list.
if ev.Type() == "m.room.member" && ev.StateKey() != nil { if ev.Type() == "m.room.member" && ev.StateKey() != nil {
userID := *ev.StateKey() targetUserID := *ev.StateKey()
membership, err := ev.Membership() membership, err := ev.Membership()
if err != nil { if err != nil {
log.WithError(err).WithField("event_id", ev.EventID()).Errorf( log.WithError(err).WithField("event_id", ev.EventID()).Errorf(
@ -77,22 +77,22 @@ func (n *Notifier) OnNewEvent(ev *gomatrixserverlib.Event, userID string, pos ty
// Keep the joined user map up-to-date // Keep the joined user map up-to-date
switch membership { switch membership {
case "invite": case "invite":
userIDs = append(userIDs, userID) userIDs = append(userIDs, targetUserID)
case "join": case "join":
// Manually append the new user's ID so they get notified // Manually append the new user's ID so they get notified
// along all members in the room // along all members in the room
userIDs = append(userIDs, userID) userIDs = append(userIDs, targetUserID)
n.addJoinedUser(ev.RoomID(), userID) n.addJoinedUser(ev.RoomID(), targetUserID)
case "leave": case "leave":
fallthrough fallthrough
case "ban": case "ban":
n.removeJoinedUser(ev.RoomID(), userID) n.removeJoinedUser(ev.RoomID(), targetUserID)
} }
} }
} }
for _, userID := range userIDs { for _, toNotifyUserID := range userIDs {
n.wakeupUser(userID, pos) n.wakeupUser(toNotifyUserID, pos)
} }
} else if len(userID) > 0 { } else if len(userID) > 0 {
n.wakeupUser(userID, pos) n.wakeupUser(userID, pos)