Skip to content
Snippets Groups Projects
Commit 767a71e0 authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Revert "debug notifications set command"

This reverts commit 088e5a6d.
parent ef319b1e
Branches
Tags
1 merge request!617Project/haven beta
......@@ -4,15 +4,13 @@ import (
"bytes"
"encoding/json"
"errors"
"time"
jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/v4/collective/versioned"
pb "gitlab.com/elixxir/comms/mixmessages"
notifCrypto "gitlab.com/elixxir/crypto/notifications"
"gitlab.com/xx_network/primitives/id"
"gitlab.com/xx_network/primitives/id/ephemeral"
"gitlab.com/xx_network/primitives/netTime"
"time"
)
func (m *manager) Set(toBeNotifiedOn *id.ID, group string, metadata []byte,
......@@ -21,13 +19,9 @@ func (m *manager) Set(toBeNotifiedOn *id.ID, group string, metadata []byte,
return err
}
jww.INFO.Printf("Notifications dummy locking SET")
m.mux.Lock()
defer m.mux.Unlock()
jww.INFO.Printf("Notifications dummy locked SET")
currentReg, exists := m.notifications[*toBeNotifiedOn]
if exists {
if currentReg.Group != group {
......@@ -40,18 +34,12 @@ func (m *manager) Set(toBeNotifiedOn *id.ID, group string, metadata []byte,
}
}
jww.INFO.Printf("Notifications dummy currentReg")
// register with remote
if status == Push && (!exists || exists && currentReg.Status != Push) {
jww.INFO.Printf("Notifications dummy PUSH")
if err := m.registerNotification([]*id.ID{toBeNotifiedOn}); err != nil {
return err
}
} else if status != Push {
jww.INFO.Printf("Notifications dummy !PUSH")
if err := m.unregisterNotification([]*id.ID{toBeNotifiedOn}); err != nil {
return err
}
......@@ -66,20 +54,15 @@ func (m *manager) Set(toBeNotifiedOn *id.ID, group string, metadata []byte,
Status: status,
},
}
jww.INFO.Printf("Notifications dummy storeRegistration")
err := m.storeRegistration(toBeNotifiedOn, reg, ts)
if err != nil {
return err
}
jww.INFO.Printf("Notifications dummy upsert")
// update in ram storage
m.upsertNotificationUnsafeRAM(toBeNotifiedOn, reg)
jww.INFO.Printf("Notifications dummy CALLBACKS")
// call the callback if it exists to notify that an update exists
if cb, cbExists := m.callbacks[group]; cbExists {
// can be nil if the last element was deleted
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment