feat: revert ring.go

SoulPancake · Jul 23, 2023 · 4145372 · 4145372
1 parent 8045439
commit 4145372
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/pubsub.go b/pubsub.go
@@ -33,8 +33,6 @@ type PubSub struct {
 	closed bool
 	exit   chan struct{}
 
-	err error
-
 	cmd *Cmd
 
 	chOnce sync.Once

diff --git a/ring.go b/ring.go
@@ -580,9 +580,8 @@ func (c *Ring) Subscribe(ctx context.Context, channels ...string) *PubSub {
 
 	shard, err := c.sharding.GetByKey(channels[0])
 	if err != nil {
-		return &PubSub{
-			err: err,
-		}
+		// TODO: return PubSub with sticky error
+		panic(err)
 	}
 	return shard.Client.Subscribe(ctx, channels...)
 }
@@ -595,9 +594,8 @@ func (c *Ring) PSubscribe(ctx context.Context, channels ...string) *PubSub {
 
 	shard, err := c.sharding.GetByKey(channels[0])
 	if err != nil {
-		return &PubSub{
-			err: err,
-		}
+		// TODO: return PubSub with sticky error
+		panic(err)
 	}
 	return shard.Client.PSubscribe(ctx, channels...)
 }
@@ -609,9 +607,8 @@ func (c *Ring) SSubscribe(ctx context.Context, channels ...string) *PubSub {
 	}
 	shard, err := c.sharding.GetByKey(channels[0])
 	if err != nil {
-		return &PubSub{
-			err: err,
-		}
+		// TODO: return PubSub with sticky error
+		panic(err)
 	}
 	return shard.Client.SSubscribe(ctx, channels...)
 }