From 7f4eb2e7e3263bbfffb1252bb2c6a0be7f6cb256 Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Wed, 3 Oct 2018 19:09:56 +0200
Subject: [PATCH] Extract function to remove channel from Redis

---
 cmd/eksterd/memory.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd/eksterd/memory.go b/cmd/eksterd/memory.go
index 0881007..8e3bcd3 100644
--- a/cmd/eksterd/memory.go
+++ b/cmd/eksterd/memory.go
@@ -267,6 +267,11 @@ func (b *memoryBackend) ChannelsUpdate(uid, name string) (microsub.Channel, erro
 	return microsub.Channel{}, fmt.Errorf("Channel %s does not exist", uid)
 }
 
+func removeChannelFromRedis(conn redis.Conn, uid string) {
+	conn.Do("SREM", "channels", uid)
+	conn.Do("DEL", "channel_sortorder_"+uid)
+}
+
 // ChannelsDelete deletes a channel
 func (b *memoryBackend) ChannelsDelete(uid string) error {
 	defer b.save()
@@ -274,8 +279,7 @@ func (b *memoryBackend) ChannelsDelete(uid string) error {
 	conn := pool.Get()
 	defer conn.Close()
 
-	conn.Do("SREM", "channels", uid)
-	conn.Do("DEL", "channel_sortorder_"+uid)
+	removeChannelFromRedis(conn, uid)
 
 	b.lock.Lock()
 	delete(b.Channels, uid)