From 434cd282873f2ddda9ac6cbf54c2525ec0aeee39 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 18 Feb 2023 16:20:02 +0100 Subject: [PATCH] upgraded gocnjhelper --- example.env | 4 ++-- go.mod | 5 ++--- go.sum | 17 ++++------------- main.go | 9 ++++++++- modules/config/config.go | 12 ++++++++++++ 5 files changed, 28 insertions(+), 19 deletions(-) diff --git a/example.env b/example.env index 4f57f18..a4c718a 100644 --- a/example.env +++ b/example.env @@ -1,8 +1,8 @@ -SERVICE_NAME=0 +SERVICE_NAME=2 SERVICE_TYPE=0 DEBUG=true HOST=127.0.0.1 -PORT=50029 +PORT=0 STORAGE_PATH=./storage/ STORAGE_URL_ADDRESS=https://alpha-storage.clickandjoin.umbach.dev/v1/ diff --git a/go.mod b/go.mod index 2a0152e..6a57f8f 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,19 @@ module clickandjoin.app/storageserver go 1.19 require ( - git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.39 + git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.46 github.com/gocql/gocql v1.3.1 github.com/gofiber/fiber/v2 v2.40.1 github.com/google/uuid v1.3.0 github.com/h2non/bimg v1.1.9 + github.com/joho/godotenv v1.5.1 github.com/scylladb/gocqlx/v2 v2.8.0 - gopkg.in/yaml.v2 v2.4.0 ) require ( github.com/andybalholm/brotli v1.0.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect - github.com/joho/godotenv v1.5.1 // indirect github.com/klauspost/compress v1.15.9 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect diff --git a/go.sum b/go.sum index 918da53..0ad124b 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,7 @@ -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.36 h1:tqx39cmvtID3lbjvUbN6Vv2Xt16fXQSwnxiw4esMqnQ= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.36/go.mod h1:RnqJsFYGR0cdxbeQjB1dDlr/MeKgnMkc7XoZtFDhMbo= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.37 h1:vw9ah/Wg+8UyTRGu+L3p23S7DxpqbuWH6a098b2qR9g= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.37/go.mod h1:RnqJsFYGR0cdxbeQjB1dDlr/MeKgnMkc7XoZtFDhMbo= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.38 h1:q18cXubjA12hKaeB7NvSK47qGTUtzsnqAWUUcCExJQY= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.38/go.mod h1:Jzc4/4ntrOLMOZYnUjkr1uBCVtRvPbEbQD+8kwBOdf4= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.39 h1:H9YLpd4hvd0wXzKW050cQIHCg6rTchfKTzxp1dgXYLY= -git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.39/go.mod h1:Jzc4/4ntrOLMOZYnUjkr1uBCVtRvPbEbQD+8kwBOdf4= +git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.45 h1:btSDPJJrXbusoLizl7W0IyNe7cYqGfVOuAPVilDwGWE= +git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.45/go.mod h1:Jzc4/4ntrOLMOZYnUjkr1uBCVtRvPbEbQD+8kwBOdf4= +git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.46 h1:bcmwpkIF3aCRZJ0nEqY0u+PitA0Bw821Byouxkc2Jdo= +git.clickandjoin.umbach.dev/ClickandJoin/go-cnj-helper v1.0.46/go.mod h1:Jzc4/4ntrOLMOZYnUjkr1uBCVtRvPbEbQD+8kwBOdf4= github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY= @@ -58,8 +54,6 @@ github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ= github.com/scylladb/go-reflectx v1.0.1/go.mod h1:rWnOfDIRWBGN0miMLIcoPt/Dhi2doCMZqwMCJ3KupFc= -github.com/scylladb/gocqlx/v2 v2.7.0 h1:/w1VeJHCEAsg9eTculTvIS9eIe/VmEu0clhlH1CF7lc= -github.com/scylladb/gocqlx/v2 v2.7.0/go.mod h1:jKhM0/LkEAhEOSwd10TCMQdlC5x8aEzK7cXjQcPyMJ0= github.com/scylladb/gocqlx/v2 v2.8.0 h1:f/oIgoEPjKDKd+RIoeHqexsIQVIbalVmT+axwvUqQUg= github.com/scylladb/gocqlx/v2 v2.8.0/go.mod h1:4/+cga34PVqjhgSoo5Nr2fX1MQIqZB5eCE5DK4xeDig= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -116,10 +110,7 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -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/main.go b/main.go index 4b26d84..4355ef9 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,14 @@ import ( func init() { config.LoadConfig() - gocnjhelper.InitLogger(config.Cfg.Debug, true, true) + cfg := config.Cfg + + gocnjhelper.InitLogger(config.Cfg.Debug, + true, + true, + gocnjhelper.GetConnectionString(cfg.RabbitMq.Username, cfg.RabbitMq.Password, cfg.RabbitMq.Host), + cfg.ServiceName, + cfg.ServiceType) scylladb.InitDatabase() } diff --git a/modules/config/config.go b/modules/config/config.go index b52296f..09b2f40 100644 --- a/modules/config/config.go +++ b/modules/config/config.go @@ -19,6 +19,7 @@ type Config struct { StoragePath string StorageUrlAddress string ScyllaDB ScyllaDB + RabbitMq RabbitMq } type ScyllaDB struct { @@ -28,6 +29,12 @@ type ScyllaDB struct { Keyspace string } +type RabbitMq struct { + Host string + Username string + Password string +} + func LoadConfig() { // argument to start the server locally for development if len(os.Args) > 1 { @@ -70,6 +77,11 @@ func LoadConfig() { Password: os.Getenv("SCYLLADB_PASSWORD"), Keyspace: os.Getenv("SCYLLADB_KEYSPACE"), }, + RabbitMq: RabbitMq{ + Host: os.Getenv("RABBITMQ_HOST"), + Username: os.Getenv("RABBITMQ_USERNAME"), + Password: os.Getenv("RABBITMQ_PASSWORD"), + }, } Cfg = cfg