Skip to content

Commit bd782cc

Browse files
committed
remove defers
Signed-off-by: Robert Landers <landers.robert@gmail.com>
1 parent f3fd052 commit bd782cc

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

cli/ext/ext.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ This is a php extension that operates as a client for durable php
3131

3232
// export_php:namespace Bottledcode\DurablePhp\Ext
3333

34+
// export_php:module shutdown
3435
func go_shutdown_module() {
36+
if helpers.NatServer != nil {
37+
helpers.NatServer.Shutdown()
38+
}
3539
os.RemoveAll(helpers.NatsState)
3640
}
3741

@@ -56,7 +60,7 @@ func go_init_module() {
5660
panic(err)
5761
}
5862

59-
s := test.RunServer(&server.Options{
63+
helpers.NatServer = test.RunServer(&server.Options{
6064
Host: "localhost",
6165
Port: 4222,
6266
NoLog: true,
@@ -66,7 +70,6 @@ func go_init_module() {
6670
StoreDir: helpers.NatsState,
6771
HTTPPort: 8222,
6872
})
69-
defer s.Shutdown()
7073
boostrapNats = true
7174
}
7275

@@ -259,7 +262,7 @@ func go_init_module() {
259262
if err != nil {
260263
panic(err)
261264
}
262-
defer consume.Drain()
265+
//defer consume.Drain()
263266

264267
orchestrationConsumer, err := billingStream.CreateOrUpdateConsumer(ctx, jetstream.ConsumerConfig{
265268
Durable: "orchestrationAggregator",
@@ -276,7 +279,7 @@ func go_init_module() {
276279
if err != nil {
277280
panic(err)
278281
}
279-
defer consume.Drain()
282+
//defer consume.Drain()
280283

281284
activityConsumer, err := billingStream.CreateOrUpdateConsumer(ctx, jetstream.ConsumerConfig{
282285
Durable: "activityAggregator",
@@ -299,7 +302,7 @@ func go_init_module() {
299302
if err != nil {
300303
panic(err)
301304
}
302-
defer consume.Drain()
305+
//defer consume.Drain()
303306
}
304307

305308
err := lib.StartBillingProcessor(ctx, cfg, helpers.Js, logger)

cli/ext/helpers/helpers.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/bottledcode/durable-php/cli/config"
1515
"github.com/bottledcode/durable-php/cli/glue"
1616
"github.com/dunglas/frankenphp"
17+
"github.com/nats-io/nats-server/v2/server"
1718
"github.com/nats-io/nats.go/jetstream"
1819
"go.uber.org/zap"
1920
"go.uber.org/zap/zapcore"
@@ -41,6 +42,7 @@ var Logger *zap.Logger
4142
var NatsState string
4243
var Js jetstream.JetStream
4344
var Config *config.Config
45+
var NatServer *server.Server
4446

4547
func ParseEvent(arr *frankenphp.Array) (ev *glue.EventMessage, err error) {
4648
ev = &glue.EventMessage{}

0 commit comments

Comments
 (0)