From 6116e8c9341de4b57dc04e089020dee9d0c60fe4 Mon Sep 17 00:00:00 2001 From: andig Date: Sun, 18 Aug 2024 19:43:28 +0200 Subject: [PATCH] Revert "chore: fix potential deadlock" This reverts commit bff27c9fbca960ee0b19e6222d05baf777128f0e. --- util/config/handler.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/config/handler.go b/util/config/handler.go index 5737f5cca..532b451d2 100644 --- a/util/config/handler.go +++ b/util/config/handler.go @@ -56,18 +56,16 @@ func (cp *handler[T]) Add(dev Device[T]) error { // Delete deletes device func (cp *handler[T]) Delete(name string) error { - cp.mu.Lock() + cp.mu.RLock() + defer cp.mu.RUnlock() for i, dev := range cp.devices { if name == dev.Config().Name { cp.devices = append(cp.devices[:i], cp.devices[i+1:]...) - cp.mu.Unlock() - bus.Publish(cp.topic, OpDelete, dev) return nil } } - cp.mu.Unlock() return fmt.Errorf("not found: %s", name) }