From ec59d59763f052973fa4a29b56eb2806c4fa0125 Mon Sep 17 00:00:00 2001 From: atridadl Date: Tue, 6 Feb 2024 23:05:22 -0700 Subject: [PATCH] Updated package structure and cleaned up logging --- go.mod | 13 ++----------- go.sum | 16 ---------------- lib/{ => pubsub/adapters}/localpubsub.go | 15 ++++++++------- lib/{ => pubsub/adapters}/redispubsub.go | 12 ++++++------ main.go | 15 ++++++++------- 5 files changed, 24 insertions(+), 47 deletions(-) rename lib/{ => pubsub/adapters}/localpubsub.go (81%) rename lib/{ => pubsub/adapters}/redispubsub.go (79%) diff --git a/go.mod b/go.mod index d21c971..de1badf 100644 --- a/go.mod +++ b/go.mod @@ -2,34 +2,25 @@ module goth.stack go 1.21.6 -require ( - github.com/alecthomas/chroma/v2 v2.12.0 - github.com/stretchr/testify v1.8.4 -) +require github.com/alecthomas/chroma/v2 v2.12.0 require ( github.com/alecthomas/repr v0.3.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/dlclark/regexp2 v1.10.0 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/google/go-cmp v0.6.0 // indirect - github.com/hexops/gotextdiff v1.0.3 // indirect github.com/labstack/gommon v0.4.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect golang.org/x/crypto v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) require ( - github.com/alecthomas/assert/v2 v2.4.1 + github.com/alecthomas/assert/v2 v2.4.1 // indirect github.com/fatih/color v1.16.0 - github.com/go-redis/redismock/v9 v9.2.0 github.com/joho/godotenv v1.5.1 github.com/labstack/echo/v4 v4.11.4 github.com/mattn/go-colorable v0.1.13 // indirect diff --git a/go.sum b/go.sum index ef9d6ad..961888a 100644 --- a/go.sum +++ b/go.sum @@ -23,14 +23,8 @@ github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-redis/redismock/v9 v9.2.0 h1:ZrMYQeKPECZPjOj5u9eyOjg8Nnb0BS9lkVIZ6IpsKLw= -github.com/go-redis/redismock/v9 v9.2.0/go.mod h1:18KHfGDK4Y6c2R0H38EUGWAdc7ZQS9gfYxc94k7rWT0= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= @@ -44,12 +38,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= -github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= @@ -65,8 +53,6 @@ github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyC github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/goldmark v1.6.0 h1:boZcn2GTjpsynOsC0iJHnBWa4Bi0qzfJjthwauItG68= -github.com/yuin/goldmark v1.6.0/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA= github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ= @@ -85,8 +71,6 @@ golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/lib/localpubsub.go b/lib/pubsub/adapters/localpubsub.go similarity index 81% rename from lib/localpubsub.go rename to lib/pubsub/adapters/localpubsub.go index c3f8b9d..d4c089b 100644 --- a/lib/localpubsub.go +++ b/lib/pubsub/adapters/localpubsub.go @@ -1,10 +1,11 @@ -package lib +package adapters import ( "context" "sync" "time" + "goth.stack/lib" "goth.stack/lib/pubsub" ) @@ -28,22 +29,22 @@ func (ps *LocalPubSub) SubscribeToChannel(channel string) (pubsub.PubSubMessage, ch := make(chan pubsub.Message, 100) ps.subscribers[channel] = append(ps.subscribers[channel], ch) - LogInfo.Printf("[PUBSUB/LOCAL] Subscribed to channel %s", channel) + lib.LogInfo.Printf("[PUBSUB/LOCAL] Subscribed to channel %s\n", channel) return &LocalPubSubMessage{messages: ch}, nil } func (ps *LocalPubSub) PublishToChannel(channel string, message string) error { - ps.lock.Lock() // Changed from RLock to Lock - defer ps.lock.Unlock() // Changed from RUnlock to Unlock + ps.lock.Lock() + defer ps.lock.Unlock() if subscribers, ok := ps.subscribers[channel]; ok { - LogInfo.Printf("[PUBSUB/LOCAL] Publishing message to channel %s: %s", channel, message) + lib.LogInfo.Printf("\n[PUBSUB/LOCAL] Publishing message to channel %s: %s\n", channel, message) for _, ch := range subscribers { ch <- pubsub.Message{Payload: message} } } else { - LogWarning.Printf("[PUBSUB/LOCAL] No subscribers for channel %s", channel) + lib.LogWarning.Printf("\n[PUBSUB/LOCAL] No subscribers for channel %s\n", channel) } return nil @@ -57,7 +58,7 @@ func (m *LocalPubSubMessage) ReceiveMessage(ctx context.Context) (*pubsub.Messag return nil, ctx.Err() case msg := <-m.messages: // A message has been received. Send it to the client. - LogInfo.Printf("[PUBSUB/LOCAL] Received message: %s", msg.Payload) + lib.LogInfo.Printf("\n[PUBSUB/LOCAL] Received message: %s\n", msg.Payload) return &msg, nil case <-time.After(30 * time.Second): // No message has been received for 30 seconds. Send a keep-alive message. diff --git a/lib/redispubsub.go b/lib/pubsub/adapters/redispubsub.go similarity index 79% rename from lib/redispubsub.go rename to lib/pubsub/adapters/redispubsub.go index a574975..81ae81f 100644 --- a/lib/redispubsub.go +++ b/lib/pubsub/adapters/redispubsub.go @@ -1,12 +1,12 @@ -package lib +package adapters import ( "context" "os" - "github.com/fatih/color" "github.com/joho/godotenv" "github.com/redis/go-redis/v9" + "goth.stack/lib" "goth.stack/lib/pubsub" ) @@ -30,7 +30,7 @@ func NewRedisClient() *redis.Client { redis_host := os.Getenv("REDIS_HOST") redis_password := os.Getenv("REDIS_PASSWORD") - LogInfo.Printf("Connecting to Redis at %s", redis_host) + lib.LogInfo.Printf("\n[PUBSUB/REDIS]Connecting to Redis at %s\n", redis_host) RedisClient = redis.NewClient(&redis.Options{ Addr: redis_host, Password: redis_password, @@ -45,7 +45,7 @@ func (m *RedisPubSubMessage) ReceiveMessage(ctx context.Context) (*pubsub.Messag if err != nil { return nil, err } - LogInfo.Printf("[PUBSUB/REDIS] Received message: %s", msg.Payload) + lib.LogInfo.Printf("\n[PUBSUB/REDIS] Received message: %s\n", msg.Payload) return &pubsub.Message{Payload: msg.Payload}, nil } @@ -55,7 +55,7 @@ func (ps *RedisPubSub) SubscribeToChannel(channel string) (pubsub.PubSubMessage, if err != nil { return nil, err } - LogInfo.Printf("[PUBSUB/REDIS] Subscribed to channel %s", channel) + lib.LogInfo.Printf("\n[PUBSUB/REDIS] Subscribed to channel %s\n", channel) return &RedisPubSubMessage{pubsub: pubsub}, nil } @@ -65,6 +65,6 @@ func (r *RedisPubSub) PublishToChannel(channel string, message string) error { if err != nil { return err } - color.Cyan("[PUBSUB/REDIS] Publishing message to channel %s: %s", channel, message) + lib.LogInfo.Printf("\n[PUBSUB/REDIS] Publishing message to channel %s: %s\n", channel, message) return nil } diff --git a/main.go b/main.go index c259291..f84ecbe 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,7 @@ import ( "goth.stack/api" "goth.stack/lib" "goth.stack/lib/pubsub" + "goth.stack/lib/pubsub/adapters" "goth.stack/pages" ) @@ -22,20 +23,20 @@ func main() { godotenv.Load(".env") // Initialize Redis client - lib.RedisClient = lib.NewRedisClient() + adapters.RedisClient = adapters.NewRedisClient() // Test Redis connection - _, err := lib.RedisClient.Ping(context.Background()).Result() + _, err := adapters.RedisClient.Ping(context.Background()).Result() // Initialize pubsub var pubSub pubsub.PubSub if err != nil { - log.Printf("Failed to connect to Redis: %v", err) - log.Println("Falling back to LocalPubSub") - pubSub = &lib.LocalPubSub{} + lib.LogWarning.Printf("\n[PUBSUB/INIT] Failed to connect to Redis: %v\n", err) + lib.LogWarning.Printf("\n[PUBSUB/INIT] Falling back to LocalPubSub\n") + pubSub = &adapters.LocalPubSub{} } else { - pubSub = &lib.RedisPubSub{ - Client: lib.RedisClient, + pubSub = &adapters.RedisPubSub{ + Client: adapters.RedisClient, } }