Upgrade to Go 1.21, remove math.Rand usage and fix a loop alias error

client/job.go

@@ -3,7 +3,7 @@ package client
 import (
 	cryptorand "crypto/rand"
 	"encoding/base64"
-	mathrand "math/rand"
+	"fmt"
 	"time"
 )
 
@@ -65,8 +65,7 @@ func RandomJid() string {
 	bytes := make([]byte, 12)
 	_, err := cryptorand.Read(bytes)
 	if err != nil {
-		//nolint:gosec
-		mathrand.Read(bytes)
+		panic(fmt.Errorf("unable to read random bytes: %w", err))
 	}
 
 	return base64.RawURLEncoding.EncodeToString(bytes)
@@ -108,10 +107,10 @@ func (j *Job) SetUniqueFor(secs uint) *Job {
 // Configure the uniqueness deadline for this job, legal values
 // are:
 //
-// - "success" - the job will be considered unique until it has successfully processed
-//   or the +unique_for+ TTL has passed, this is the default value.
-// - "start" - the job will be considered unique until it starts processing. Retries
-//   may lead to multiple copies of the job running.
+//   - "success" - the job will be considered unique until it has successfully processed
+//     or the +unique_for+ TTL has passed, this is the default value.
+//   - "start" - the job will be considered unique until it starts processing. Retries
+//     may lead to multiple copies of the job running.
 func (j *Job) SetUniqueness(until UniqueUntil) *Job {
 	return j.SetCustom("unique_until", until)
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/contribsys/faktory
 
-go 1.19
+go 1.21
 
 require (
 	github.com/BurntSushi/toml v0.4.1

server/task_runner.go

@@ -93,6 +93,7 @@ func (ts *taskRunner) cycle() {
 	ts.mutex.RLock()
 	defer ts.mutex.RUnlock()
 	for _, t := range ts.tasks {
+		t := t
 		if sec%t.every != 0 {
 			continue
 		}

test/load/main.go

@@ -42,15 +42,6 @@ func main() {
 		threads = athreads
 	}
 
-	seed := int64(420)
-	if argc > 3 {
-		aseed, err := strconv.ParseInt(os.Args[3], 10, 64)
-		if err != nil {
-			log.Fatal(err)
-		}
-		seed = aseed
-	}
-
 	fmt.Printf("Running loadtest with %d jobs and %d threads\n", jobs, threads)
 
 	client, err := faktory.Open()
@@ -61,7 +52,6 @@ func main() {
 	defer client.Close()
 	client.Flush()
 
-	rand.Seed(int64(seed))
 	opsCount = make([]int, threads)
 	run()
 }

util/util.go

@@ -6,7 +6,6 @@ import (
 	"encoding/base64"
 	"fmt"
 	"math/big"
-	mathrand "math/rand"
 	"os"
 	"runtime"
 	"time"
@@ -58,8 +57,7 @@ func RandomJid() string {
 	bytes := make([]byte, 12)
 	_, err := cryptorand.Read(bytes)
 	if err != nil {
-		//nolint:gosec
-		mathrand.Read(bytes)
+		panic(fmt.Errorf("unable to read random bytes: %w", err))
 	}
 
 	return base64.RawURLEncoding.EncodeToString(bytes)