Merge pull request #19 from hadican/ignore-self

feat: ignore self if set true

Author: hsluoyz

Diff for: watcher.go

@@ -226,7 +226,16 @@ func (w *Watcher) subscribe() {
 			default:
 			}
 			data := msg.Payload
-			w.callback(data)
+			msgStruct := &MSG{}
+			err := msgStruct.UnmarshalBinary([]byte(data))
+			if err != nil {
+				log.Println(fmt.Printf("Failed to parse message: %s with error: %s\n", data, err.Error()))
+			} else {
+				isSelf := msgStruct.ID == w.options.LocalID
+				if !(w.options.IgnoreSelf && isSelf) {
+					w.callback(data)
+				}
+			}
 		}
 	}()
 	wg.Wait()

Diff for: watcher_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/casbin/casbin/v2"
 )
 
-func initWatcher(t *testing.T) (*casbin.Enforcer, *Watcher) {
-	w, err := NewWatcher("127.0.0.1:6379", WatcherOptions{})
+func initWatcherWithOptions(t *testing.T, wo WatcherOptions) (*casbin.Enforcer, *Watcher) {
+	w, err := NewWatcher("127.0.0.1:6379", wo)
 	if err != nil {
 		t.Fatalf("Failed to connect to Redis: %v", err)
 	}
@@ -25,6 +25,11 @@ func initWatcher(t *testing.T) (*casbin.Enforcer, *Watcher) {
 	_ = e.SetWatcher(w)
 	return e, w.(*Watcher)
 }
+
+func initWatcher(t *testing.T) (*casbin.Enforcer, *Watcher) {
+	return initWatcherWithOptions(t, WatcherOptions{})
+}
+
 func TestWatcher(t *testing.T) {
 	_, w := initWatcher(t)
 	_ = w.SetUpdateCallback(func(s string) {
@@ -35,6 +40,19 @@ func TestWatcher(t *testing.T) {
 	time.Sleep(time.Millisecond * 500)
 }
 
+func TestWatcherWithIgnoreSelfTrue(t *testing.T) {
+	wo := WatcherOptions{
+		IgnoreSelf: true,
+		OptionalUpdateCallback: func(s string) {
+			t.Fatalf("This callback should not be called when IgnoreSelf is set true.")
+		},
+	}
+	_, w := initWatcherWithOptions(t, wo)
+	_ = w.Update()
+	w.Close()
+	time.Sleep(time.Millisecond * 500)
+}
+
 func TestUpdate(t *testing.T) {
 	_, w := initWatcher(t)
 	_ = w.SetUpdateCallback(func(s string) {