cmd/eksterd/app.go

@@ -3,18 +3,12 @@ package main
 import (
 	"fmt"
 	"log"
-	"math/rand"
 	"net/http"
-	"time"
 
 	"github.com/pkg/errors"
 	"p83.nl/go/ekster/pkg/server"
 )
 
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
 // App is the main app structure
 type App struct {
 	options    AppOptions

cmd/eksterd/memory.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"bytes"
 	"database/sql"
-	"expvar"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -16,7 +15,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/lib/pq"
 	"p83.nl/go/ekster/pkg/auth"
 	"p83.nl/go/ekster/pkg/fetch"
 	"p83.nl/go/ekster/pkg/microsub"
@@ -28,14 +26,6 @@ import (
 	"willnorris.com/go/microformats"
 )
 
-var (
-	varMicrosub *expvar.Map
-)
-
-func init() {
-	varMicrosub = expvar.NewMap("microsub")
-}
-
 // DefaultPrio is the priority value for new channels
 const DefaultPrio = 9999999
 
@@ -135,53 +125,27 @@ GROUP BY c.id;
 	return channels, nil
 }
 
-func shouldRetryWithNewUID(err error, try int) bool {
-	if err == nil {
-		return false
-	}
-
-	if e, ok := err.(*pq.Error); ok {
-		if e.Code == "23505" && e.Constraint == "channels_uid_key" {
-			if try > 5 {
-				return false
-			}
-			return true
-		}
-	}
-	return false
-}
-
 // ChannelsCreate creates a channels
 func (b *memoryBackend) ChannelsCreate(name string) (microsub.Channel, error) {
-	varMicrosub.Add("ChannelsCreate", 1)
-	/*
-	 * try 5 times to generate a uid for a channel.
-	 * If we get a database error we retry.
-	 */
-	try := 0
+	uid := util.RandStringBytes(24)
+
 	channel := microsub.Channel{
+		UID:    uid,
 		Name:   name,
 		Unread: microsub.Unread{Type: microsub.UnreadCount},
 	}
-	for {
-		varMicrosub.Add("ChannelsCreate.RandStringBytes", 1)
-		channel.UID = util.RandStringBytes(24)
-		result, err := b.database.Exec(`insert into "channels" ("uid", "name", "created_at") values($1, $2, DEFAULT)`, channel.UID, channel.Name)
-		if err != nil {
-			log.Println("channels insert", err)
-			if !shouldRetryWithNewUID(err, try) {
-				return channel, err
-			}
-			try++
-			continue
-		}
-		if n, err := result.RowsAffected(); err != nil {
-			if n > 0 {
-				b.broker.Notifier <- sse.Message{Event: "new channel", Object: channelMessage{1, channel}}
-			}
-		}
-		return channel, nil
+
+	result, err := b.database.Exec(`insert into "channels" ("uid", "name", "created_at") values($1, $2, DEFAULT)`, channel.UID, channel.Name)
+	if err != nil {
+		return channel, err
 	}
+
+	if n, err := result.RowsAffected(); err != nil {
+		if n > 0 {
+			b.broker.Notifier <- sse.Message{Event: "new channel", Object: channelMessage{1, channel}}
+		}
+	}
+	return channel, nil
 }
 
 // ChannelsUpdate updates a channels