summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2022-01-19 10:21:55 +0300
committerGitHub <[email protected]>2022-01-19 10:21:55 +0300
commitb49a0b183b234efcbd5e58bea5433439ab037a84 (patch)
treede6f408173dcc82837aebe4062980ed47fbe1aaa
parentbd934bb4dcdcb65e183ad642de3071a712fd618b (diff)
parent1b451b0e9e3c6970ee1ed5aec94ee0ffcf008f4e (diff)
[#944]: release: `v2.7.3`v2.7.3
-rw-r--r--CHANGELOG.md9
-rw-r--r--Dockerfile10
-rw-r--r--go.mod16
-rw-r--r--go.sum32
-rw-r--r--internal/container/plugins.go4
-rw-r--r--internal/container/plugins_test.go18
6 files changed, 61 insertions, 28 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78027cd1..356fb662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
# CHANGELOG
+## 2.7.3 (19.01.2022)
+
+## 🩹 Fixes:
+
+- 🐛 Fix: `jobs` pipeline shadowing if registering the pipeline with the existing name [BUG](https://github.com/roadrunner-server/roadrunner/issues/943)
+- 🐛 Fix: `reload` plugin doesn't collect a resettable plugins [BUG](https://github.com/roadrunner-server/roadrunner/issues/942)
+
+---
+
## v2.7.2 (17.01.2022)
## 👀 New:
diff --git a/Dockerfile b/Dockerfile
index 5ecd3752..261b2511 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,11 @@ ENV LDFLAGS="-s \
-X github.com/roadrunner-server/roadrunner/v2/internal/meta.buildTime=$BUILD_TIME"
# compile binary file
-RUN set -x \
- && CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr \
- && ./rr -v
+RUN set -x
+RUN go mod download
+RUN go mod tidy
+RUN CGO_ENABLED=0 go build -trimpath -ldflags "$LDFLAGS" -o ./rr ./cmd/rr
+RUN ./rr -v
# Image page: <https://hub.docker.com/_/alpine>
# https://alpinelinux.org/posts/Alpine-3.13.4-released.html
@@ -31,7 +33,7 @@ ARG BUILD_TIME="undefined"
LABEL \
org.opencontainers.image.title="roadrunner" \
- org.opencontainers.image.description="High-performance PHP application server, load-balancer and process manager" \
+ org.opencontainers.image.description="High-performance PHP application server, load-balancer, process manager written in Go and powered with plugins" \
org.opencontainers.image.url="https://github.com/roadrunner-server/roadrunner" \
org.opencontainers.image.source="https://github.com/roadrunner-server/roadrunner" \
org.opencontainers.image.vendor="SpiralScout" \
diff --git a/go.mod b/go.mod
index b999fec2..c36416c8 100644
--- a/go.mod
+++ b/go.mod
@@ -19,32 +19,32 @@ require (
github.com/roadrunner-server/errors v1.1.0
github.com/roadrunner-server/fileserver/v2 v2.0.0-rc.1
github.com/roadrunner-server/goridge/v3 v3.3.0
- github.com/roadrunner-server/grpc/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/grpc/v2 v2.0.0-rc.2
github.com/roadrunner-server/gzip/v2 v2.0.0-rc.1
github.com/roadrunner-server/headers/v2 v2.0.0-rc.1
- github.com/roadrunner-server/http/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/http/v2 v2.0.0-rc.2
github.com/roadrunner-server/informer/v2 v2.0.0-rc.2
- github.com/roadrunner-server/jobs/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/jobs/v2 v2.0.0-rc.2
github.com/roadrunner-server/kv/v2 v2.0.0-rc.1
github.com/roadrunner-server/logger/v2 v2.0.0-rc.3
github.com/roadrunner-server/memcached/v2 v2.0.0-rc.1
github.com/roadrunner-server/memory/v2 v2.0.0-rc.1
github.com/roadrunner-server/metrics/v2 v2.0.0-rc.2
github.com/roadrunner-server/nats/v2 v2.0.0-rc.1
- github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.2
github.com/roadrunner-server/prometheus/v2 v2.0.0-rc.1
github.com/roadrunner-server/redis/v2 v2.0.0-rc.2
- github.com/roadrunner-server/reload/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/reload/v2 v2.0.0-rc.2
github.com/roadrunner-server/resetter/v2 v2.0.0-rc.1
github.com/roadrunner-server/rpc/v2 v2.0.0-rc.2
github.com/roadrunner-server/sdk/v2 v2.0.0-rc.1
- github.com/roadrunner-server/server/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/server/v2 v2.0.0-rc.2
github.com/roadrunner-server/service/v2 v2.0.0-rc.1
github.com/roadrunner-server/sqs/v2 v2.0.0-rc.1
github.com/roadrunner-server/static/v2 v2.0.0-rc.1
github.com/roadrunner-server/status/v2 v2.0.0-rc.1
github.com/roadrunner-server/tcp/v2 v2.0.0-rc.1
- github.com/roadrunner-server/websockets/v2 v2.0.0-rc.1
+ github.com/roadrunner-server/websockets/v2 v2.0.0-rc.2
github.com/spf13/cobra v1.3.0
github.com/stretchr/testify v1.7.0
github.com/temporalio/roadrunner-temporal v1.2.0-rc.2
@@ -160,7 +160,7 @@ require (
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/tools v0.1.8 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
- google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 // indirect
+ google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 // indirect
google.golang.org/grpc v1.43.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
diff --git a/go.sum b/go.sum
index a909f371..2204050b 100644
--- a/go.sum
+++ b/go.sum
@@ -110,6 +110,8 @@ github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwel
github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
github.com/buger/goterm v1.0.1 h1:kSgw3jcjYUzC0Uh/eG8ULjccuz353solup27lUH8Zug=
github.com/buger/goterm v1.0.1/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE=
+github.com/buger/goterm v1.0.3 h1:7V/HeAQHrzPk/U4BvyH2g9u+xbUW9nr4yRPyG59W4fM=
+github.com/buger/goterm v1.0.3/go.mod h1:HiFWV3xnkolgrBV3mY8m0X0Pumt4zg4QhbdOzQtB8tE=
github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI=
github.com/caddyserver/certmagic v0.15.2 h1:OMTakTsLM1ZfzMDjwvYprfUgFzpVPh3u87oxMPwmeBc=
github.com/caddyserver/certmagic v0.15.2/go.mod h1:qhkAOthf72ufAcp3Y5jF2RaGE96oip3UbEQRIzwe3/8=
@@ -505,18 +507,18 @@ github.com/roadrunner-server/fileserver/v2 v2.0.0-rc.1 h1:tGNbac9ZImI04nqZWBnlEJ
github.com/roadrunner-server/fileserver/v2 v2.0.0-rc.1/go.mod h1:PB9DZZrOfDCJIB+HgJShM29lHWYoWdz8sES7KDm6mmk=
github.com/roadrunner-server/goridge/v3 v3.3.0 h1:Zrftjk2xNGzNnrma31ZrlPmwTJQIAa0Kmdeb58v+BQ4=
github.com/roadrunner-server/goridge/v3 v3.3.0/go.mod h1:nOtQp0LEx2vxfnVT8/1PQIyK0BpFGhg8S0OCdlKdXbI=
-github.com/roadrunner-server/grpc/v2 v2.0.0-rc.1 h1:A9Llggun04RRMEuUV5Ru9O1cVFGg60YJLuJpDwqaxNs=
-github.com/roadrunner-server/grpc/v2 v2.0.0-rc.1/go.mod h1:hmgxRFxz1epBgIUb5mbzR93/HwnrBWaKQ9LqbGhMU9g=
+github.com/roadrunner-server/grpc/v2 v2.0.0-rc.2 h1:HldQ2c5Xyai8ToS+zD2pmQTxm2xwDKczGCD+gJsx0/U=
+github.com/roadrunner-server/grpc/v2 v2.0.0-rc.2/go.mod h1:hmgxRFxz1epBgIUb5mbzR93/HwnrBWaKQ9LqbGhMU9g=
github.com/roadrunner-server/gzip/v2 v2.0.0-rc.1 h1:zVRBji320eZ0ElGXdYmBWIBvN0rz+nfeZenoGvxXIps=
github.com/roadrunner-server/gzip/v2 v2.0.0-rc.1/go.mod h1:ckTwl1QUoQ0SMF+/FXnlT9JMlhkCfhmgA02lu8aYFTM=
github.com/roadrunner-server/headers/v2 v2.0.0-rc.1 h1:DyGgXAm2//UuemSVyOf9s+OLXYygeulL/yGAC6h0h0I=
github.com/roadrunner-server/headers/v2 v2.0.0-rc.1/go.mod h1:oFZvmmC5WnA0NP+ZwTJoz3vbEgtjZSAu6BFpstzS4Qc=
-github.com/roadrunner-server/http/v2 v2.0.0-rc.1 h1:i+lk6BvX/21L/daUZ/hQb3iasW70NRXq098ngHqZC1E=
-github.com/roadrunner-server/http/v2 v2.0.0-rc.1/go.mod h1:VkMerfM3xoSEmWjraXSpkyhOittkl5ih+Y41FKBiegk=
+github.com/roadrunner-server/http/v2 v2.0.0-rc.2 h1:c63rhtZloWqbaXLubEB+J9fX3/28pARtEUWoSmCY62M=
+github.com/roadrunner-server/http/v2 v2.0.0-rc.2/go.mod h1:VkMerfM3xoSEmWjraXSpkyhOittkl5ih+Y41FKBiegk=
github.com/roadrunner-server/informer/v2 v2.0.0-rc.2 h1:WIr78JtN1RmGwGCXonvXjWdjpWAn5W9APO5NH+UORGk=
github.com/roadrunner-server/informer/v2 v2.0.0-rc.2/go.mod h1:qu6KuwSjmvk8wt++99n4001fk4G8Qs7MQA/yj8UxCcU=
-github.com/roadrunner-server/jobs/v2 v2.0.0-rc.1 h1:HQa+rdNIE3So9y+4tGwY/OXXGSBxH4wU4W8w3gndKIY=
-github.com/roadrunner-server/jobs/v2 v2.0.0-rc.1/go.mod h1:ZCg8bmoGPZHhpnGQEzqHXnxdpixgA1qrbB5/dQKRXeg=
+github.com/roadrunner-server/jobs/v2 v2.0.0-rc.2 h1:0SCtQ5MFcZXQ4bGdl+9c3JeMjfSJ7he9HLPKVrMahus=
+github.com/roadrunner-server/jobs/v2 v2.0.0-rc.2/go.mod h1:ZCg8bmoGPZHhpnGQEzqHXnxdpixgA1qrbB5/dQKRXeg=
github.com/roadrunner-server/kv/v2 v2.0.0-rc.1 h1:Py/XSQHiy4MDK+k46qiqFysET1X7kuu5iL/7+HRRmDQ=
github.com/roadrunner-server/kv/v2 v2.0.0-rc.1/go.mod h1:4/kBaRrfyD3Rx1a8H84vlXGyhP/ZFed2GfY7pOcChSg=
github.com/roadrunner-server/logger/v2 v2.0.0-rc.3 h1:RmciD6OBe/JcE2plEid0epfIUFo4WHcgPAWBhArrYAw=
@@ -529,22 +531,23 @@ github.com/roadrunner-server/metrics/v2 v2.0.0-rc.2 h1:/8VeNv+VRzCnuJIA+UVni0fr+
github.com/roadrunner-server/metrics/v2 v2.0.0-rc.2/go.mod h1:hw0n9aaw8LsBFJs0eze/Rm+1dxNZS90O9M4JBEmZ0Mo=
github.com/roadrunner-server/nats/v2 v2.0.0-rc.1 h1:S1aj01LkVBChtZ+zddVJLxonVidBFplGmXO3C5dzqLc=
github.com/roadrunner-server/nats/v2 v2.0.0-rc.1/go.mod h1:ivzmg7sXh4iEfjnmI/WcG7c3GNKYqfVZ1AdbTDe7Px0=
-github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.1 h1:pU+6enFGBnHFjSLpYbztN6xtDzIQXq5oDmF+lQIJrTc=
-github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.1/go.mod h1:FGj7phCUIQ1S/qQ5ZukoYu2Qss/Ol3vv5eT4iea/B3A=
+github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.2 h1:MtB5SajXn4vx4Yk/ifQPL1qvVCjFxBGtXzAG98j6Qxs=
+github.com/roadrunner-server/new_relic/v2 v2.0.0-rc.2/go.mod h1:FGj7phCUIQ1S/qQ5ZukoYu2Qss/Ol3vv5eT4iea/B3A=
github.com/roadrunner-server/prometheus/v2 v2.0.0-rc.1 h1:zLdwzyFINEzKDzwPqxDoROI0kIAh1kGpahwV87ybIeU=
github.com/roadrunner-server/prometheus/v2 v2.0.0-rc.1/go.mod h1:CXXM0zWbDJzhbyOjBTKPZHA2B6N7MdEasTdb78CV3CY=
github.com/roadrunner-server/redis/v2 v2.0.0-rc.2 h1:fIOyS0+2Q7bh/Nw6vWn92Hku4hJiTitqIECB3b+IwDQ=
github.com/roadrunner-server/redis/v2 v2.0.0-rc.2/go.mod h1:ePRmTLkIhSPAIg6FscLXtwrAbSePo7q0BHeA22ZMcgw=
-github.com/roadrunner-server/reload/v2 v2.0.0-rc.1 h1:oRnhU84lSZGM7aeSi2JstDr6um8cw723K/FWRdriEuI=
-github.com/roadrunner-server/reload/v2 v2.0.0-rc.1/go.mod h1:Z4g4JYEsPc/40Zl/dfZ/IYmpMG3p/7z95uiFfwqZQFg=
+github.com/roadrunner-server/reload/v2 v2.0.0-rc.2 h1:2dOv7yHGt0QZK2qLWDl8tzgbLISLB+p8R7bfD+QHrCg=
+github.com/roadrunner-server/reload/v2 v2.0.0-rc.2/go.mod h1:Z4g4JYEsPc/40Zl/dfZ/IYmpMG3p/7z95uiFfwqZQFg=
github.com/roadrunner-server/resetter/v2 v2.0.0-rc.1 h1:1T6ZSzRLpgJAckcAymqQ//BfbG4j4Vln8VPuZWpCmHA=
github.com/roadrunner-server/resetter/v2 v2.0.0-rc.1/go.mod h1:yITeDQQbhR09q1IJIx5eoZVJvqVs8AhTH6MjDmhXuKM=
github.com/roadrunner-server/rpc/v2 v2.0.0-rc.2 h1:fQy+F6+uxsDF0HjqrEV20nVkIZhGZE9XSR0NTfWr2JY=
github.com/roadrunner-server/rpc/v2 v2.0.0-rc.2/go.mod h1:Kd7CtFvcJa92WtdQzha1aobX5JXfaTsLLdEA7vTI1Iw=
github.com/roadrunner-server/sdk/v2 v2.0.0-rc.1 h1:Lr74Slj3Hy+R6msDtx1yZwr52sOk/7jEICOs5d14LnA=
github.com/roadrunner-server/sdk/v2 v2.0.0-rc.1/go.mod h1:p3ENuBdCHQGgUn8Xji4N5tRb6e5NXX8yKbgtHY/caxQ=
-github.com/roadrunner-server/server/v2 v2.0.0-rc.1 h1:TKqzoh+BWiCjze9QIilRMSZzT55i31bN9xFHXLRN+uM=
github.com/roadrunner-server/server/v2 v2.0.0-rc.1/go.mod h1:y9Meo8M6RzOa1mIcJ31O0koZhcE/mhvQ/8lT9SP9pZQ=
+github.com/roadrunner-server/server/v2 v2.0.0-rc.2 h1:kbWCi5GHiaeXB7JVwkFTSdEFLrlcaf39rxlo7tIfP9c=
+github.com/roadrunner-server/server/v2 v2.0.0-rc.2/go.mod h1:y9Meo8M6RzOa1mIcJ31O0koZhcE/mhvQ/8lT9SP9pZQ=
github.com/roadrunner-server/service/v2 v2.0.0-rc.1 h1:HEx8J1gMnkkwpk5pZc7xFaNXhvwzpdHHMKtFiPFfcug=
github.com/roadrunner-server/service/v2 v2.0.0-rc.1/go.mod h1:gUyO617p/d1QZwJ1dz/Wi+4Kp73B83L9uRv+Tnelo1s=
github.com/roadrunner-server/sqs/v2 v2.0.0-rc.1 h1:Zvzx2br5FHN9MRMJe7xhdJzW2R8MeO7TrFoWrj3Kamw=
@@ -557,8 +560,8 @@ github.com/roadrunner-server/tcp/v2 v2.0.0-rc.1 h1:JGA6LPOKS8kbgFYT+VC6WhCxSxmp9
github.com/roadrunner-server/tcp/v2 v2.0.0-rc.1/go.mod h1:JfY6IFotYsSvYPXp7FCgthyiIYQEWaunWZVzEXKYsKU=
github.com/roadrunner-server/tcplisten v1.1.0 h1:DozwuIiND9seqz4infLvGTcSIJ5nDv9gF9H8UKNtXP8=
github.com/roadrunner-server/tcplisten v1.1.0/go.mod h1:2MjzsggdgxCca4p2k3YJdWdo/QnQehiOTy0knlE226c=
-github.com/roadrunner-server/websockets/v2 v2.0.0-rc.1 h1:QsVl6zt0RJ2kGK5pgHS07OAFwtUnoxFAi3XzJF+dQ50=
-github.com/roadrunner-server/websockets/v2 v2.0.0-rc.1/go.mod h1:hOU4S4fRHp+9ErYBFQuNO2NQYtUc1jYCO3w5IM/dkSU=
+github.com/roadrunner-server/websockets/v2 v2.0.0-rc.2 h1:g+ZHG2HnDXFlQcE1WQPlM9YEk4dpdv6K/Htp6j+Q/fA=
+github.com/roadrunner-server/websockets/v2 v2.0.0-rc.2/go.mod h1:hOU4S4fRHp+9ErYBFQuNO2NQYtUc1jYCO3w5IM/dkSU=
github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -1097,8 +1100,9 @@ google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ6
google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 h1:aCsSLXylHWFno0r4S3joLpiaWayvqd2Mn4iSvx4WZZc=
google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5 h1:zzNejm+EgrbLfDZ6lu9Uud2IVvHySPl8vQzf04laR5Q=
+google.golang.org/genproto v0.0.0-20220118154757-00ab72f36ad5/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
diff --git a/internal/container/plugins.go b/internal/container/plugins.go
index 7cbead2b..fe775f04 100644
--- a/internal/container/plugins.go
+++ b/internal/container/plugins.go
@@ -33,7 +33,7 @@ import (
"github.com/roadrunner-server/kv/v2"
"github.com/roadrunner-server/memcached/v2"
"github.com/roadrunner-server/tcp/v2"
- roadrunner_temporal "github.com/temporalio/roadrunner-temporal"
+ rrt "github.com/temporalio/roadrunner-temporal"
)
// Plugins returns active plugins for the endure container. Feel free to add or remove any plugins.
@@ -101,6 +101,6 @@ func Plugins() []interface{} { //nolint:funlen
&tcp.Plugin{},
// temporal plugins
- &roadrunner_temporal.Plugin{},
+ &rrt.Plugin{},
}
}
diff --git a/internal/container/plugins_test.go b/internal/container/plugins_test.go
new file mode 100644
index 00000000..b857f09a
--- /dev/null
+++ b/internal/container/plugins_test.go
@@ -0,0 +1,18 @@
+package container
+
+import (
+ "reflect"
+ "testing"
+)
+
+func TestPlugins(t *testing.T) {
+ for _, p := range Plugins() {
+ if p == nil {
+ t.Error("plugin cannot be nil")
+ }
+
+ if pk := reflect.TypeOf(p).Kind(); pk != reflect.Ptr && pk != reflect.Struct {
+ t.Errorf("plugin %v must be a structure or pointer to the structure", p)
+ }
+ }
+}