Skip to content

Commit f1214fa

Browse files
appleboyappleboy
committed
chore: refactor producer-consumer example and update dependencies
- Delete the README file for the producer-consumer example - Change `QueuedMessage` to `TaskMessage` in consumer and worker main functions - Update the method from `m.Bytes()` to `m.Payload()` in consumer and worker main functions - Remove `nats.WithDisableConsumer()` from the producer main function - Upgrade `github.com/golang-queue/queue` dependency from v0.2.1 to v0.3.0 - Remove indirect dependencies `github.com/vmihailenco/msgpack/v5` and `github.com/vmihailenco/tagparser/v2` from go.mod and go.sum files Signed-off-by: appleboy <[email protected]>
1 parent 210c4c2 commit f1214fa

File tree

8 files changed

+10
-52
lines changed

8 files changed

+10
-52
lines changed

‎_example/producer-consumer/README.md

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎_example/producer-consumer/consumer/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ func main() {
3535
nats.WithAddr("127.0.0.1:4222"),
3636
nats.WithSubj("example"),
3737
nats.WithQueue("foobar"),
38-
nats.WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
38+
nats.WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
3939
var v *job
40-
if err := json.Unmarshal(m.Bytes(), &v); err != nil {
40+
if err := json.Unmarshal(m.Payload(), &v); err != nil {
4141
return err
4242
}
4343
rets <- v.Message

‎_example/producer-consumer/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.22
55
require (
66
github.com/appleboy/graceful v0.0.4
77
github.com/golang-queue/nats v0.0.3-0.20210907015837-3e2e4b448b3d
8-
github.com/golang-queue/queue v0.2.1
8+
github.com/golang-queue/queue v0.3.0
99
)
1010

1111
require (
@@ -14,8 +14,6 @@ require (
1414
github.com/nats-io/nats.go v1.38.0 // indirect
1515
github.com/nats-io/nkeys v0.4.9 // indirect
1616
github.com/nats-io/nuid v1.0.1 // indirect
17-
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
18-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
1917
golang.org/x/crypto v0.31.0 // indirect
2018
golang.org/x/sys v0.28.0 // indirect
2119
)

‎_example/producer-consumer/go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
3838
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
3939
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4040
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
41-
github.com/golang-queue/queue v0.2.1 h1:W0JeHniILD4oxvs+E/hDuV0zlnQh0qeTy73BAjrigCw=
42-
github.com/golang-queue/queue v0.2.1/go.mod h1:eUZ3HH9GbhoEKQSlxCBQ4pPXeadbJ7QKBMZ0kIZNDHI=
41+
github.com/golang-queue/queue v0.3.0 h1:gyBLNT9EDOsChazYScp8iLiwLfG0SdnCDmNUybcHig4=
42+
github.com/golang-queue/queue v0.3.0/go.mod h1:SkjMwz1TjxZOrF7kABvbar1CagcMxwRtXt5Tx00wb4g=
4343
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4444
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
4545
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -92,10 +92,6 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA
9292
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
9393
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
9494
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
95-
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
96-
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
97-
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
98-
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
9995
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
10096
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
10197
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=

‎_example/producer-consumer/producer/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func main() {
3030
nats.WithAddr("127.0.0.1:4222"),
3131
nats.WithSubj("example"),
3232
nats.WithQueue("foobar"),
33-
nats.WithDisableConsumer(),
3433
)
3534

3635
// define the queue

‎_example/worker/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22
44

55
require (
66
github.com/golang-queue/nats v0.0.2-0.20210822122542-200fdcf19ebf
7-
github.com/golang-queue/queue v0.2.1
7+
github.com/golang-queue/queue v0.3.0
88
)
99

1010
require (
@@ -13,8 +13,6 @@ require (
1313
github.com/nats-io/nats.go v1.38.0 // indirect
1414
github.com/nats-io/nkeys v0.4.9 // indirect
1515
github.com/nats-io/nuid v1.0.1 // indirect
16-
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
17-
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
1816
golang.org/x/crypto v0.31.0 // indirect
1917
golang.org/x/sys v0.28.0 // indirect
2018
)

‎_example/worker/go.sum

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
3636
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
3737
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
3838
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
39-
github.com/golang-queue/queue v0.2.1 h1:W0JeHniILD4oxvs+E/hDuV0zlnQh0qeTy73BAjrigCw=
40-
github.com/golang-queue/queue v0.2.1/go.mod h1:eUZ3HH9GbhoEKQSlxCBQ4pPXeadbJ7QKBMZ0kIZNDHI=
39+
github.com/golang-queue/queue v0.3.0 h1:gyBLNT9EDOsChazYScp8iLiwLfG0SdnCDmNUybcHig4=
40+
github.com/golang-queue/queue v0.3.0/go.mod h1:SkjMwz1TjxZOrF7kABvbar1CagcMxwRtXt5Tx00wb4g=
4141
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4242
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
4343
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -90,10 +90,6 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA
9090
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
9191
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
9292
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
93-
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
94-
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
95-
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
96-
github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
9793
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
9894
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
9995
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=

‎_example/worker/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func main() {
3333
nats.WithAddr("127.0.0.1:4222"),
3434
nats.WithSubj("example"),
3535
nats.WithQueue("foobar"),
36-
nats.WithRunFunc(func(ctx context.Context, m core.QueuedMessage) error {
36+
nats.WithRunFunc(func(ctx context.Context, m core.TaskMessage) error {
3737
var v *job
38-
if err := json.Unmarshal(m.Bytes(), &v); err != nil {
38+
if err := json.Unmarshal(m.Payload(), &v); err != nil {
3939
return err
4040
}
4141
rets <- v.Message

0 commit comments

Comments
 (0)