diff --git a/cmd/server/main.go b/cmd/server/main.go index 06b1c862d..01f9185c7 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -51,10 +51,9 @@ func main() { // (debugging: show services that are enabled or not) if appConfig.Debug { services.Logger.Debug().Msgf( - "datastore: %s | cachestore: %s | taskmanager: %s [%s] | new_relic: %t | paymail: %t | graphql: %t", + "datastore: %s | cachestore: %s | taskmanager: %s | new_relic: %t | paymail: %t | graphql: %t", appConfig.Db.Datastore.Engine.String(), appConfig.Cache.Engine.String(), - config.TaskManagerEngine, appConfig.TaskManager.Factory.String(), appConfig.NewRelic.Enabled, appConfig.Paymail.Enabled, diff --git a/config/services.go b/config/services.go index cc1688a85..441ad0887 100644 --- a/config/services.go +++ b/config/services.go @@ -394,23 +394,13 @@ func splitBroadcastClientApis(apis []string) []broadcastclient.ArcClientConfig { } func loadTaskManager(appConfig *AppConfig, options []bux.ClientOps) []bux.ClientOps { - // Load task manager (redis or taskq) - // todo: this needs more improvement with redis options etc - if TaskManagerEngine == taskmanager.TaskQ { - config := taskmanager.DefaultTaskQConfig(TaskManagerQueueName) - if appConfig.TaskManager.Factory == taskmanager.FactoryRedis { - options = append( - options, - bux.WithTaskQUsingRedis( - config, - &redis.Options{ - Addr: strings.Replace(appConfig.Cache.Redis.URL, "redis://", "", -1), - }, - )) - } else { - options = append(options, bux.WithTaskQ(config, appConfig.TaskManager.Factory)) - } + ops := []taskmanager.TasqOps{} + if appConfig.TaskManager.Factory == taskmanager.FactoryRedis { + ops = append(ops, taskmanager.WithRedis(appConfig.Cache.Redis.URL)) } + options = append(options, bux.WithTaskqConfig( + taskmanager.DefaultTaskQConfig(TaskManagerQueueName, ops...), + )) return options } diff --git a/config/task_manager.go b/config/task_manager.go index 885f162f3..506367381 100644 --- a/config/task_manager.go +++ b/config/task_manager.go @@ -1,11 +1,6 @@ package config -import ( - "github.com/BuxOrg/bux/taskmanager" -) - // TaskManager defaults const ( - TaskManagerEngine = taskmanager.TaskQ TaskManagerQueueName = "bux_queue" ) diff --git a/go.mod b/go.mod index 6d4f3b43c..c1d12abd2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/99designs/gqlgen v0.17.41 - github.com/BuxOrg/bux v0.8.1 + github.com/BuxOrg/bux v0.9.0 github.com/BuxOrg/bux-models v0.2.1 github.com/bitcoin-sv/go-broadcast-client v0.9.0 github.com/go-ozzo/ozzo-validation v3.6.0+incompatible diff --git a/go.sum b/go.sum index c4751ce61..39c754888 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/99designs/gqlgen v0.17.41 h1:C1/zYMhGVP5TWNCNpmZ9Mb6CqT1Vr5SHEWoTOEJ3v3I= github.com/99designs/gqlgen v0.17.41/go.mod h1:GQ6SyMhwFbgHR0a8r2Wn8fYgEwPxxmndLFPhU63+cJE= -github.com/BuxOrg/bux v0.8.1 h1:YEMK1LXOEJyFqyqafH7ZI0jm19a+y5HiNFQh5ZRCdbk= -github.com/BuxOrg/bux v0.8.1/go.mod h1:9h8+Sdw907Cf2IzVrlH16O/K6kyxUGfpp3wqO+ous4k= +github.com/BuxOrg/bux v0.9.0 h1:mj0rvJ0jc8lMGXOZ2XKdOlddxEaN3fjrCq/WC5D8POM= +github.com/BuxOrg/bux v0.9.0/go.mod h1:XmW5W1ST2y1sCOGnUM0nfpFC5ld2wVk7SpnYztZsiCE= github.com/BuxOrg/bux-models v0.2.1 h1:wgNTYCqisH3M+Z87hb0Jpbxc8MMdOEJ35mdw/WoZ73k= github.com/BuxOrg/bux-models v0.2.1/go.mod h1:nH3MOdsIPPerBPOiEvwA01yTeArYtBk+PtDo7E+vPCk= github.com/DATA-DOG/go-sqlmock v1.5.1 h1:FK6RCIUSfmbnI/imIICmboyQBkOckutaa6R5YYlLZyo=