Skip to content

Commit 00cc245

Browse files
authored
fix: nats consumer deleted on shutdown (#5377)
1 parent 96e773e commit 00cc245

File tree

6 files changed

+15
-13
lines changed

6 files changed

+15
-13
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/davecgh/go-spew v1.1.1
2121
github.com/deckarep/golang-set v1.8.0
2222
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1
23-
github.com/devtron-labs/common-lib v0.0.19
23+
github.com/devtron-labs/common-lib v0.0.20
2424
github.com/devtron-labs/go-bitbucket v0.9.60-beta
2525
github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534
2626
github.com/evanphx/json-patch v5.7.0+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADG
185185
github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
186186
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1 h1:qdkpTAo2Kr0ZicZIVXfNwsGSshpc9OB9j9RzmKYdIwY=
187187
github.com/devtron-labs/authenticator v0.4.35-0.20240607135426-c86e868ecee1/go.mod h1:IkKPPEfgLCMR29he5yv2OCC6iM2R7K5/0AA3k8b9XNc=
188-
github.com/devtron-labs/common-lib v0.0.19 h1:vrTP4y3m824qKrfjcxe0FJCz5uZEsYEnFAeRnWm6+bI=
189-
github.com/devtron-labs/common-lib v0.0.19/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
188+
github.com/devtron-labs/common-lib v0.0.20 h1:PH33VGmXZFx7U+rwXYnNXkB90sGbBTW0KHFonraJpG8=
189+
github.com/devtron-labs/common-lib v0.0.20/go.mod h1:UZGPt1ep9Tnd9Ak2sibGSiLr7p3ijO2/JLT+h+pqBuU=
190190
github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
191191
github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
192192
github.com/devtron-labs/protos v0.0.3-0.20240326053929-48e42d9d4534 h1:TElPRU69QedW7DIQiiQxtjwSQ6cK0fCTAMGvSLhP0ac=

pkg/deployment/trigger/devtronApps/TriggerService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ func (impl *TriggerServiceImpl) handleCDTriggerRelease(ctx context.Context, over
739739

740740
func (impl *TriggerServiceImpl) auditDeploymentTriggerHistory(cdWfrId int, valuesOverrideResponse *app.ValuesOverrideResponse, ctx context.Context, triggeredAt time.Time, triggeredBy int32) (err error) {
741741
if valuesOverrideResponse.Pipeline == nil || valuesOverrideResponse.EnvOverride == nil {
742-
impl.logger.Warnw("unable to save histories for deployment trigger, invalid valuesOverrideResponse received", "pipelineId", valuesOverrideResponse.Pipeline.Id, "cdWfrId", cdWfrId)
742+
impl.logger.Warnw("unable to save histories for deployment trigger, invalid valuesOverrideResponse received", "cdWfrId", cdWfrId)
743743
return nil
744744
}
745745
err1 := impl.deployedConfigurationHistoryService.CreateHistoriesForDeploymentTrigger(ctx, valuesOverrideResponse.Pipeline, valuesOverrideResponse.PipelineStrategy, valuesOverrideResponse.EnvOverride, triggeredAt, triggeredBy)

vendor/github.com/devtron-labs/common-lib/pubsub-lib/NatsClient.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/devtron-labs/common-lib/pubsub-lib/PubSubClientService.go

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ github.com/devtron-labs/authenticator/jwt
381381
github.com/devtron-labs/authenticator/middleware
382382
github.com/devtron-labs/authenticator/oidc
383383
github.com/devtron-labs/authenticator/password
384-
# github.com/devtron-labs/common-lib v0.0.19
384+
# github.com/devtron-labs/common-lib v0.0.20
385385
## explicit; go 1.21
386386
github.com/devtron-labs/common-lib/blob-storage
387387
github.com/devtron-labs/common-lib/cloud-provider-identifier

0 commit comments

Comments
 (0)