diff options
| -rw-r--r-- | container/plugins.go | 4 | ||||
| -rw-r--r-- | go.mod | 14 | ||||
| -rw-r--r-- | go.sum | 29 |
3 files changed, 23 insertions, 24 deletions
diff --git a/container/plugins.go b/container/plugins.go index 079842da..22d90b7f 100644 --- a/container/plugins.go +++ b/container/plugins.go @@ -3,6 +3,7 @@ package container import ( cache "github.com/darkweak/souin/plugins/roadrunner" "github.com/roadrunner-server/amqp/v3" + appLogger "github.com/roadrunner-server/app-logger/v3" "github.com/roadrunner-server/beanstalk/v3" "github.com/roadrunner-server/boltdb/v3" "github.com/roadrunner-server/centrifuge/v3" @@ -23,7 +24,6 @@ import ( rrOtel "github.com/roadrunner-server/otel/v3" "github.com/roadrunner-server/prometheus/v3" proxyIP "github.com/roadrunner-server/proxy_ip_parser/v3" - psr3 "github.com/roadrunner-server/psr-3-logger/v3" "github.com/roadrunner-server/redis/v3" "github.com/roadrunner-server/reload/v3" "github.com/roadrunner-server/resetter/v3" @@ -50,7 +50,7 @@ func Plugins() []any { //nolint:funlen // logger plugin &logger.Plugin{}, // psr-3 logger extension - &psr3.Plugin{}, + &appLogger.Plugin{}, // metrics plugin &metrics.Plugin{}, // reload plugin @@ -10,6 +10,7 @@ require ( github.com/joho/godotenv v1.4.0 github.com/olekukonko/tablewriter v0.0.5 github.com/roadrunner-server/amqp/v3 v3.0.0-beta.2 + github.com/roadrunner-server/app-logger/v3 v3.0.0-beta.2 github.com/roadrunner-server/beanstalk/v3 v3.0.0-beta.2 github.com/roadrunner-server/boltdb/v3 v3.0.0-beta.1 github.com/roadrunner-server/centrifuge/v3 v3.0.0-beta.2 @@ -34,7 +35,6 @@ require ( github.com/roadrunner-server/otel/v3 v3.0.0-beta.1 github.com/roadrunner-server/prometheus/v3 v3.0.0-beta.1 github.com/roadrunner-server/proxy_ip_parser/v3 v3.0.0-beta.1 - github.com/roadrunner-server/psr-3-logger/v3 v3.0.0-alpha.1 github.com/roadrunner-server/redis/v3 v3.0.0-beta.2 github.com/roadrunner-server/reload/v3 v3.0.0-beta.1 github.com/roadrunner-server/resetter/v3 v3.0.0-beta.1 @@ -42,7 +42,7 @@ require ( github.com/roadrunner-server/sdk/v3 v3.0.0-beta.4 github.com/roadrunner-server/send/v3 v3.0.0-beta.1 github.com/roadrunner-server/server/v3 v3.0.0-beta.4 - github.com/roadrunner-server/service/v3 v3.0.0-beta.1 + github.com/roadrunner-server/service/v3 v3.0.0-beta.2 github.com/roadrunner-server/sqs/v3 v3.0.0-beta.1 github.com/roadrunner-server/static/v3 v3.0.0-beta.1 github.com/roadrunner-server/status/v3 v3.0.0-beta.1 @@ -51,7 +51,7 @@ require ( github.com/spf13/viper v1.13.0 github.com/stretchr/testify v1.8.1 github.com/temporalio/roadrunner-temporal/v2 v2.0.0-beta.3 - go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.21 + go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.23 ) require ( @@ -73,7 +73,7 @@ require ( github.com/aws/smithy-go v1.13.4 // indirect github.com/beanstalkd/go-beanstalk v0.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d // indirect + github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 // indirect github.com/buraksezer/connpool v0.6.0 // indirect github.com/buraksezer/consistent v0.9.0 // indirect github.com/buraksezer/olric v0.4.8 // indirect @@ -192,10 +192,10 @@ require ( github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/xujiajun/mmap-go v1.0.1 // indirect - github.com/xujiajun/nutsdb v0.10.0 // indirect + github.com/xujiajun/nutsdb v0.11.0 // indirect github.com/xujiajun/utils v0.0.0-20220904132955-5f7c5b914235 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect - go.buf.build/grpc/go/roadrunner-server/api v1.4.21 // indirect + go.buf.build/grpc/go/roadrunner-server/api v1.4.23 // indirect go.etcd.io/bbolt v1.3.6 // indirect go.etcd.io/etcd/api/v3 v3.5.5 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect @@ -218,7 +218,7 @@ require ( go.temporal.io/api v1.12.0 // indirect go.temporal.io/sdk v1.17.0 // indirect go.temporal.io/sdk/contrib/tally v0.2.0 // indirect - go.temporal.io/server v1.18.3 // indirect + go.temporal.io/server v1.18.4 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect @@ -117,8 +117,8 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= +github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822 h1:hjXJeBcAMS1WGENGqDpzvmgS43oECTx8UXq31UBu0Jw= +github.com/bradfitz/gomemcache v0.0.0-20221031212613-62deef7fc822/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/buger/goterm v1.0.4 h1:Z9YvGmOih81P0FbVtEYTFF6YsSgxSUKEhf/f9bTMXbY= github.com/buger/goterm v1.0.4/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE= github.com/buraksezer/connpool v0.6.0 h1:NnTWkd3OH3BAn4qbeI+Ks1XDzU0DQRgOfF+SxsUMdtU= @@ -374,7 +374,6 @@ github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/z github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.12.0 h1:kr3j8iIMR4ywO/O0rvksXaJvauGGCMg2zAZIiNZ9uIQ= @@ -600,6 +599,8 @@ github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8= github.com/rivo/uniseg v0.4.2/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/roadrunner-server/amqp/v3 v3.0.0-beta.2 h1:T50msBUDoXSsRndEsMjKB6vWOhRGyhVa4GRk+am8zyw= github.com/roadrunner-server/amqp/v3 v3.0.0-beta.2/go.mod h1:aF5KWQGgb9FUYTf34gyKiwAA2VY4zyGClt1Dw5NX4qk= +github.com/roadrunner-server/app-logger/v3 v3.0.0-beta.2 h1:vT3CIZWPapsgaTjpCrpR3b7YyFJNNM+XfdOv/27S1rE= +github.com/roadrunner-server/app-logger/v3 v3.0.0-beta.2/go.mod h1:n1ncVSoz/GaFkjH7qPyNLwLj0VKRVYGDP0sZcJEmeJM= github.com/roadrunner-server/beanstalk/v3 v3.0.0-beta.2 h1:FXKXMIjqoBruTsG4oXdbktluxzjsAHAT40lx1S5auro= github.com/roadrunner-server/beanstalk/v3 v3.0.0-beta.2/go.mod h1:xtkhMLF4fBtoG7cdM3aR5gU+8xYO2Oh2BwusicSCkuw= github.com/roadrunner-server/boltdb/v3 v3.0.0-beta.1 h1:GbDdgALcaYEcGq1fTPoF5GtZ6zTDBGq+paNk9d/lvPk= @@ -648,8 +649,6 @@ github.com/roadrunner-server/prometheus/v3 v3.0.0-beta.1 h1:TFXvhKZRjV+CMWDAm0CB github.com/roadrunner-server/prometheus/v3 v3.0.0-beta.1/go.mod h1:cuOjoV6rpMSPqQrCxkMNoUnibeiAtNwRl/Qa7HmR+9Q= github.com/roadrunner-server/proxy_ip_parser/v3 v3.0.0-beta.1 h1:kMlapSheYGt4B1oSxU55tSWMXhODEKvSyaJsHazfWUs= github.com/roadrunner-server/proxy_ip_parser/v3 v3.0.0-beta.1/go.mod h1:boLj+qvrTs2inv8/vYPRzRIKE/H3IZD0L3VIWUSjMNU= -github.com/roadrunner-server/psr-3-logger/v3 v3.0.0-alpha.1 h1:u/Tj52jA4LiRX69O6H05L05tG+ndsyKzbcX+93ma+5w= -github.com/roadrunner-server/psr-3-logger/v3 v3.0.0-alpha.1/go.mod h1:+NPA0X3plpwsDX3CeaT8BnP0J61AeYR353GT3zNXonQ= github.com/roadrunner-server/redis/v3 v3.0.0-beta.2 h1:zZ+/MBpWPc7We/hQRAjI0AGgczeJxYg0+KPRlIuFwCA= github.com/roadrunner-server/redis/v3 v3.0.0-beta.2/go.mod h1:4Oy8D4ZojLLxgT8EktAjmcjBTjI0OdoD+tcTcEb1wH8= github.com/roadrunner-server/reload/v3 v3.0.0-beta.1 h1:qlltzzM4lqevQwu4op6hFnQfBVN6JSAvT9pJKv9bucQ= @@ -664,8 +663,8 @@ github.com/roadrunner-server/send/v3 v3.0.0-beta.1 h1:7KwjSFzASAS7e5QwVJkdDr46xF github.com/roadrunner-server/send/v3 v3.0.0-beta.1/go.mod h1:3Q5+HLG1qvzSQAK0n5o066vFuZOesij+0Oa48kgjR44= github.com/roadrunner-server/server/v3 v3.0.0-beta.4 h1:D8GziWLNX+B5Hp7dL2dtBGg3T3I7yMu2Fq7JkhTPLeo= github.com/roadrunner-server/server/v3 v3.0.0-beta.4/go.mod h1:a9PentczlwYSFeDdOdsQ9YQcSdxgkZwvZAWauT/k1nk= -github.com/roadrunner-server/service/v3 v3.0.0-beta.1 h1:2dZDduexqgrCJdApPFwhf0NXZzPPtQWOkG8gPkJJBjQ= -github.com/roadrunner-server/service/v3 v3.0.0-beta.1/go.mod h1:7kPeC4Kk43/AMw3EOYev7Tf/hxhBGzm1YtHkY6r/NU4= +github.com/roadrunner-server/service/v3 v3.0.0-beta.2 h1:sSGkYTgUD3VewDtvR4TMb7xUhC2tkn+ZUm+z/RZPnI4= +github.com/roadrunner-server/service/v3 v3.0.0-beta.2/go.mod h1:ctyHHJM8XJEMrUQBiqC3EXizMkdd6RWxudbKerM/uTk= github.com/roadrunner-server/sqs/v3 v3.0.0-beta.1 h1:/Frlpr4soCtHpb9B+zsGn4Qt0pc/H6hePN5Ya7ZCkIA= github.com/roadrunner-server/sqs/v3 v3.0.0-beta.1/go.mod h1:9GA/NyzQPCyGMVRnu4nB67gAzn/Fr+5g0dTYXggJ8ns= github.com/roadrunner-server/static/v3 v3.0.0-beta.1 h1:dlBJ1DslxXLmzaaeRteXBAbk15vT4wgpfvPCJj3bmKI= @@ -767,8 +766,8 @@ github.com/xujiajun/gorouter v1.2.0/go.mod h1:yJrIta+bTNpBM/2UT8hLOaEAFckO+m/qmR github.com/xujiajun/mmap-go v1.0.1 h1:7Se7ss1fLPPRW+ePgqGpCkfGIZzJV6JPq9Wq9iv/WHc= github.com/xujiajun/mmap-go v1.0.1/go.mod h1:CNN6Sw4SL69Sui00p0zEzcZKbt+5HtEnYUsc6BKKRMg= github.com/xujiajun/nutsdb v0.9.0/go.mod h1:8ZdTTF0cEQO+wN940htfHYKswFql2iB6Osckx+GmOoU= -github.com/xujiajun/nutsdb v0.10.0 h1:kSxd7MyZiAVQM2I79FK74WneGI+uaHsUdak8dbjzKJc= -github.com/xujiajun/nutsdb v0.10.0/go.mod h1:8ZdTTF0cEQO+wN940htfHYKswFql2iB6Osckx+GmOoU= +github.com/xujiajun/nutsdb v0.11.0 h1:uzQb3Tvib0R/5kwdt6AcEJJpHtmcunGGMsq63dhnyyM= +github.com/xujiajun/nutsdb v0.11.0/go.mod h1:sAT5Kr8+53X2r1eFMHw2VSPLSAo/PiJCZPK5QtMsw7g= github.com/xujiajun/utils v0.0.0-20190123093513-8bf096c4f53b/go.mod h1:AZd87GYJlUzl82Yab2kTjx1EyXSQCAfZDhpTo1SQC4k= github.com/xujiajun/utils v0.0.0-20220904132955-5f7c5b914235 h1:w0si+uee0iAaCJO9q86T6yrhdadgcsoNuh47LrUykzg= github.com/xujiajun/utils v0.0.0-20220904132955-5f7c5b914235/go.mod h1:MR4+0R6A9NS5IABnIM3384FfOq8QFVnm7WDrBOhIaMU= @@ -780,10 +779,10 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.buf.build/grpc/go/roadrunner-server/api v1.4.21 h1:+qJ6PxMmxVEdsOAziqP1WxONPJUeeNWU+6TFetj2ZeQ= -go.buf.build/grpc/go/roadrunner-server/api v1.4.21/go.mod h1:gydvLOEhY1OyTQFdpzBvDRn2QMpmtb73BSFFKu3JmPk= -go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.21 h1:WM/QGrZTBpqRxFx7myI1e5WcsRWfSL1m3dUy7N91o/I= -go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.21/go.mod h1:CfIAvR+W2N+Y0WXMzwT80Eh83CmBPWplgFQDA5HftC4= +go.buf.build/grpc/go/roadrunner-server/api v1.4.23 h1:WqIHbagc3x+IatoPoKbzuP1iN+dLqQZkPo1n9DPkrkY= +go.buf.build/grpc/go/roadrunner-server/api v1.4.23/go.mod h1:gydvLOEhY1OyTQFdpzBvDRn2QMpmtb73BSFFKu3JmPk= +go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.23 h1:iWddHyg7bItQaMU8FkHwzCtE0mc/Q4gnrQ3J+fijJ3g= +go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.23/go.mod h1:CfIAvR+W2N+Y0WXMzwT80Eh83CmBPWplgFQDA5HftC4= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= @@ -841,8 +840,8 @@ go.temporal.io/sdk v1.17.0 h1:5zF4nBg35R7V+J/m8ke2tIWJNpiqRK2EpWZBQkVQCEc= go.temporal.io/sdk v1.17.0/go.mod h1:EybaEzZSigK4Pr0wBbP1cb4VrCEf8ZowcigT7LCgsMU= go.temporal.io/sdk/contrib/tally v0.2.0 h1:XnTJIQcjOv+WuCJ1u8Ve2nq+s2H4i/fys34MnWDRrOo= go.temporal.io/sdk/contrib/tally v0.2.0/go.mod h1:1kpSuCms/tHeJQDPuuKkaBsMqfHnIIRnCtUYlPNXxuE= -go.temporal.io/server v1.18.3 h1:ELXx7lOkuxfMItTxuSw5zpTeH8yL79Yyf2v4IEDrHDs= -go.temporal.io/server v1.18.3/go.mod h1:66GmtRD75LKrEMdGBSiCqySE9WzpTWf5vLxejRwyZIY= +go.temporal.io/server v1.18.4 h1:4J9FAXIpfvnfLP87Tuip+Iz2Lj0bQnTnspAwgnlpsoo= +go.temporal.io/server v1.18.4/go.mod h1:hycAzkuRXn8EkkwTGjneHxNpIOw5gQa08fVWo9E9Atc= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= |