vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2025-09-17 02:29:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix notification locking issues

Browse source
This commit is contained in:
Daniel 2019-03-18 16:30:17 +01:00
parent 0a4f97d7fa
commit e50553951f
2 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
notifications/database.go
View file

@ -11,6 +11,7 @@ import (
"github.com/Safing/portbase/database/query"
"github.com/Safing/portbase/database/record"
"github.com/Safing/portbase/database/storage"
"github.com/Safing/portbase/log"
)
var (
@ -44,8 +45,8 @@ type StorageInterface struct {
// Get returns a database record.
func (s *StorageInterface) Get(key string) (record.Record, error) {
notsLock.Lock()
defer notsLock.Unlock()
notsLock.RLock()
defer notsLock.RUnlock()
// transform key
if strings.HasPrefix(key, "all/") {
@ -72,8 +73,8 @@ func (s *StorageInterface) Query(q *query.Query, local, internal bool) (*iterato
}
func (s *StorageInterface) processQuery(q *query.Query, it *iterator.Iterator) {
notsLock.Lock()
defer notsLock.Unlock()
notsLock.RLock()
defer notsLock.RUnlock()
// send all notifications
for _, n := range nots {
@ -107,10 +108,9 @@ func registerAsDatabase() error {
// Put stores a record in the database.
func (s *StorageInterface) Put(r record.Record) error {
r.Lock()
// record is already locked!
key := r.DatabaseKey()
n, err := EnsureNotification(r)
r.Unlock()
if err != nil {
return ErrInvalidData
@ -123,22 +123,32 @@ func (s *StorageInterface) Put(r record.Record) error {
return ErrInvalidPath
}
notsLock.Lock()
// continue in goroutine
go updateNotificationFromDatabasePut(n, key)
return nil
}
func updateNotificationFromDatabasePut(n *Notification, key string) {
// seperate goroutine in order to correctly lock notsLock
notsLock.RLock()
origN, ok := nots[key]
notsLock.Unlock()
notsLock.RUnlock()
if ok {
// existing notification, update selected action ID only
n.Lock()
defer n.Unlock()
go origN.SelectAndExecuteAction(n.SelectedActionID)
if n.SelectedActionID != "" {
log.Tracef("notifications: user selected action for %s: %s", n.ID, n.SelectedActionID)
go origN.SelectAndExecuteAction(n.SelectedActionID)
}
} else {
// accept new notification as is
notsLock.Lock()
nots[key] = n
notsLock.Unlock()
}
return nil
}
// Delete deletes a record from the database.