Skip to content

Commit 92fc954

Browse files
authored
[#1468]: pre-release: v2023.1.0-alpha.2
2 parents 30879ba + e644052 commit 92fc954

File tree

5 files changed

+124
-121
lines changed

5 files changed

+124
-121
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Set up Go
4141
uses: actions/setup-go@v3 # action page: <https://github.com/actions/setup-go>
4242
with:
43-
go-version: '1.20'
43+
go-version: '1.19'
4444

4545
- name: Run linter
4646
uses: golangci/[email protected]

cmd/rr/command_test.go

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ import (
55
"io"
66
"os"
77
"testing"
8+
"time"
89

910
"github.com/stretchr/testify/assert"
10-
"github.com/stretchr/testify/require"
1111
)
1212

1313
func Test_Main(t *testing.T) {
1414
os.Args = []string{"rr", "--help"}
1515
exitFn = func(code int) { assert.Equal(t, 0, code) }
1616

17-
r, w, err := os.Pipe()
18-
require.NoError(t, err)
17+
r, w, _ := os.Pipe()
1918
os.Stdout = w
2019

2120
main()
2221
_ = w.Close()
2322
buf := new(bytes.Buffer)
24-
_, err = io.Copy(buf, r)
25-
require.NoError(t, err)
23+
24+
_ = r.SetReadDeadline(time.Now().Add(time.Second))
25+
_, _ = io.Copy(buf, r)
2626

2727
assert.Contains(t, buf.String(), "Usage:")
2828
assert.Contains(t, buf.String(), "Available Commands:")
@@ -33,15 +33,13 @@ func Test_MainWithoutCommands(t *testing.T) {
3333
os.Args = []string{"rr"}
3434
exitFn = func(code int) { assert.Equal(t, 0, code) }
3535

36-
r, w, err := os.Pipe()
37-
require.NoError(t, err)
36+
r, w, _ := os.Pipe()
3837
os.Stdout = w
3938

4039
main()
41-
_ = w.Close()
4240
buf := new(bytes.Buffer)
43-
_, err = io.Copy(buf, r)
44-
require.NoError(t, err)
41+
_ = r.SetReadDeadline(time.Now().Add(time.Second))
42+
_, _ = io.Copy(buf, r)
4543

4644
assert.Contains(t, buf.String(), "Usage:")
4745
assert.Contains(t, buf.String(), "Available Commands:")
@@ -52,15 +50,15 @@ func Test_MainUnknownSubcommand(t *testing.T) {
5250
os.Args = []string{"", "foobar"}
5351
exitFn = func(code int) { assert.Equal(t, 1, code) }
5452

55-
r, w, err := os.Pipe()
56-
require.NoError(t, err)
53+
r, w, _ := os.Pipe()
5754
os.Stderr = w
5855

5956
main()
6057
_ = w.Close()
6158
buf := new(bytes.Buffer)
62-
_, err = io.Copy(buf, r)
63-
require.NoError(t, err)
59+
60+
_ = r.SetReadDeadline(time.Now().Add(time.Second))
61+
_, _ = io.Copy(buf, r)
6462

6563
assert.Contains(t, buf.String(), "unknown command")
6664
assert.Contains(t, buf.String(), "foobar")

container/plugins.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/roadrunner-server/informer/v4"
1515
"github.com/roadrunner-server/jobs/v4"
1616
"github.com/roadrunner-server/kv/v4"
17+
"github.com/roadrunner-server/lock/v4"
1718
"github.com/roadrunner-server/logger/v4"
1819
"github.com/roadrunner-server/memcached/v4"
1920
"github.com/roadrunner-server/memory/v4"
@@ -44,7 +45,8 @@ func Plugins() []any { //nolint:funlen
4445
&informer.Plugin{},
4546
// resetter plugin (./rr reset)
4647
&resetter.Plugin{},
47-
48+
// mutexes(locks)
49+
&lock.Plugin{},
4850
// logger plugin
4951
&logger.Plugin{},
5052
// psr-3 logger extension

go.mod

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,49 @@ require (
88
github.com/fatih/color v1.14.1
99
github.com/joho/godotenv v1.5.1
1010
github.com/olekukonko/tablewriter v0.0.5
11-
github.com/roadrunner-server/amqp/v4 v4.1.1
11+
github.com/roadrunner-server/amqp/v4 v4.1.2
1212
github.com/roadrunner-server/api/v3 v3.2.1
13-
github.com/roadrunner-server/app-logger/v4 v4.0.1
14-
github.com/roadrunner-server/beanstalk/v4 v4.1.1
15-
github.com/roadrunner-server/boltdb/v4 v4.2.1
16-
github.com/roadrunner-server/centrifuge/v4 v4.0.2
17-
github.com/roadrunner-server/config/v4 v4.1.1
13+
github.com/roadrunner-server/app-logger/v4 v4.0.2
14+
github.com/roadrunner-server/beanstalk/v4 v4.1.2
15+
github.com/roadrunner-server/boltdb/v4 v4.2.2
16+
github.com/roadrunner-server/centrifuge/v4 v4.0.3
17+
github.com/roadrunner-server/config/v4 v4.1.2
1818
github.com/roadrunner-server/endure/v2 v2.2.0
1919
github.com/roadrunner-server/errors v1.2.0
20-
github.com/roadrunner-server/fileserver/v4 v4.0.1
20+
github.com/roadrunner-server/fileserver/v4 v4.0.2
2121
github.com/roadrunner-server/goridge/v3 v3.6.2
22-
github.com/roadrunner-server/grpc/v4 v4.1.0
23-
github.com/roadrunner-server/gzip/v4 v4.0.1
24-
github.com/roadrunner-server/headers/v4 v4.0.1
25-
github.com/roadrunner-server/http/v4 v4.0.3
26-
github.com/roadrunner-server/informer/v4 v4.0.1
27-
github.com/roadrunner-server/jobs/v4 v4.2.1
28-
github.com/roadrunner-server/kv/v4 v4.1.1
29-
github.com/roadrunner-server/logger/v4 v4.0.1
30-
github.com/roadrunner-server/memcached/v4 v4.1.2
31-
github.com/roadrunner-server/memory/v4 v4.1.1
32-
github.com/roadrunner-server/metrics/v4 v4.0.1
33-
github.com/roadrunner-server/nats/v4 v4.1.1
34-
github.com/roadrunner-server/otel/v4 v4.1.0
35-
github.com/roadrunner-server/prometheus/v4 v4.0.2
36-
github.com/roadrunner-server/proxy_ip_parser/v4 v4.0.2
37-
github.com/roadrunner-server/redis/v4 v4.1.1
38-
github.com/roadrunner-server/reload/v4 v4.0.1
39-
github.com/roadrunner-server/resetter/v4 v4.0.1
40-
github.com/roadrunner-server/rpc/v4 v4.1.0
22+
github.com/roadrunner-server/grpc/v4 v4.1.1
23+
github.com/roadrunner-server/gzip/v4 v4.0.2
24+
github.com/roadrunner-server/headers/v4 v4.0.2
25+
github.com/roadrunner-server/http/v4 v4.0.4
26+
github.com/roadrunner-server/informer/v4 v4.0.2
27+
github.com/roadrunner-server/jobs/v4 v4.2.2
28+
github.com/roadrunner-server/kv/v4 v4.1.2
29+
github.com/roadrunner-server/lock/v4 v4.0.0-beta.1
30+
github.com/roadrunner-server/logger/v4 v4.0.2
31+
github.com/roadrunner-server/memcached/v4 v4.1.3
32+
github.com/roadrunner-server/memory/v4 v4.1.2
33+
github.com/roadrunner-server/metrics/v4 v4.0.2
34+
github.com/roadrunner-server/nats/v4 v4.1.2
35+
github.com/roadrunner-server/otel/v4 v4.1.1
36+
github.com/roadrunner-server/prometheus/v4 v4.0.3
37+
github.com/roadrunner-server/proxy_ip_parser/v4 v4.0.3
38+
github.com/roadrunner-server/redis/v4 v4.1.2
39+
github.com/roadrunner-server/reload/v4 v4.0.2
40+
github.com/roadrunner-server/resetter/v4 v4.0.2
41+
github.com/roadrunner-server/rpc/v4 v4.1.1
4142
github.com/roadrunner-server/sdk/v4 v4.2.0
42-
github.com/roadrunner-server/send/v4 v4.0.2
43-
github.com/roadrunner-server/server/v4 v4.0.1
44-
github.com/roadrunner-server/service/v4 v4.0.2
45-
github.com/roadrunner-server/sqs/v4 v4.1.1
46-
github.com/roadrunner-server/static/v4 v4.0.2
47-
github.com/roadrunner-server/status/v4 v4.0.1
48-
github.com/roadrunner-server/tcp/v4 v4.0.1
43+
github.com/roadrunner-server/send/v4 v4.0.3
44+
github.com/roadrunner-server/server/v4 v4.0.2
45+
github.com/roadrunner-server/service/v4 v4.0.3
46+
github.com/roadrunner-server/sqs/v4 v4.1.2
47+
github.com/roadrunner-server/static/v4 v4.0.3
48+
github.com/roadrunner-server/status/v4 v4.0.2
49+
github.com/roadrunner-server/tcp/v4 v4.0.2
4950
github.com/spf13/cobra v1.6.1
5051
github.com/spf13/viper v1.15.0
5152
github.com/stretchr/testify v1.8.1
52-
github.com/temporalio/roadrunner-temporal/v4 v4.1.0
53+
github.com/temporalio/roadrunner-temporal/v4 v4.2.0-alpha.1
5354
go.buf.build/protocolbuffers/go/roadrunner-server/api v1.3.31
5455
go.uber.org/automaxprocs v1.5.1
5556
golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb
@@ -129,7 +130,7 @@ require (
129130
github.com/rabbitmq/amqp091-go v1.7.0 // indirect
130131
github.com/rivo/uniseg v0.4.3 // indirect
131132
github.com/roadrunner-server/api/v4 v4.1.0 // indirect
132-
github.com/roadrunner-server/tcplisten v1.2.1 // indirect
133+
github.com/roadrunner-server/tcplisten v1.3.0 // indirect
133134
github.com/robfig/cron v1.2.0 // indirect
134135
github.com/savsgio/dictpool v0.0.0-20221023140959-7bf2e61cea94 // indirect
135136
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect

0 commit comments

Comments
 (0)