Skip to content

fix: check for nil client before closing#10635

Merged
powersj merged 1 commit intoinfluxdata:masterfrom
powersj:fix/amqp-check-client
Feb 15, 2022
Merged

fix: check for nil client before closing#10635
powersj merged 1 commit intoinfluxdata:masterfrom
powersj:fix/amqp-check-client

Conversation

@powersj
Copy link
Copy Markdown
Contributor

@powersj powersj commented Feb 11, 2022

Recently added the logic to close the connection, but in some cases it
appears that the connection is already nil.

Fixes: #10634

@powersj
fix: check for nil client before closing
8e959e7 
Recently added the logic to close the connection, but in some cases it
appears that the connection is already nil.

Fixes: influxdata#10634
@telegraf-tiger telegraf-tiger bot added the fix pr to fix corresponding bug label Feb 11, 2022
@powersj powersj mentioned this pull request Feb 11, 2022
Closed
@telegraf-tiger
Copy link
Copy Markdown
Contributor

telegraf-tiger bot commented Feb 11, 2022

Download PR build artifacts for linux_amd64.tar.gz, darwin_amd64.tar.gz, and windows_amd64.zip.
Downloads for additional architectures and packages are available below.

☺️ This pull request doesn't significantly change the Telegraf binary size (less than 1%)

📦 Click here to get additional PR build artifacts

Artifact URLs

DEB RPM TAR GZ ZIP
amd64.deb aarch64.rpm darwin_amd64.tar.gz windows_amd64.zip
arm64.deb armel.rpm darwin_arm64.tar.gz windows_i386.zip
armel.deb armv6hl.rpm freebsd_amd64.tar.gz
armhf.deb i386.rpm freebsd_armv7.tar.gz
i386.deb ppc64le.rpm freebsd_i386.tar.gz
mips.deb riscv64.rpm linux_amd64.tar.gz
mipsel.deb s390x.rpm linux_arm64.tar.gz
ppc64el.deb x86_64.rpm linux_armel.tar.gz
riscv64.deb linux_armhf.tar.gz
s390x.deb linux_i386.tar.gz
linux_mips.tar.gz
linux_mipsel.tar.gz
linux_ppc64le.tar.gz
linux_riscv64.tar.gz
linux_s390x.tar.gz
static_linux_amd64.tar.gz

MyaLongmire
MyaLongmire approved these changes Feb 11, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@MyaLongmire MyaLongmire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm :)

@powersj powersj merged commit 0c4df85 into influxdata:master Feb 15, 2022
@powersj powersj deleted the fix/amqp-check-client branch February 15, 2022 17:21
powersj added a commit that referenced this pull request Feb 16, 2022
@powersj
fix: check for nil client before closing in amqp (#10635)
7c81f59 
(cherry picked from commit 0c4df85)
phemmer added a commit to phemmer/telegraf that referenced this pull request Feb 18, 2022
@phemmer
Merge remote-tracking branch 'origin/master' into postgres
e87744d 
* origin/master: (211 commits)
  feat: update configs (influxdata#10676)
  feat[elastic output]: add elastic pipeline flags (influxdata#10505)
  Update changelog
  fix: ensure folders do not get loaded more than once (influxdata#10551)
  docs: update VMWare doc links (influxdata#10663)
  fix: prometheusremotewrite wrong timestamp unit (influxdata#10547)
  feat: update configs (influxdata#10662)
  fix: add graylog toml tags (influxdata#10660)
  feat: add socks5 proxy support for kafka output plugin (influxdata#8192)
  docs: override reported OpenSearch version (influxdata#10586)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10659)
  fix: bump all go.opentelemetry.io dependencies (influxdata#10647)
  feat: collection offset implementation (influxdata#10545)
  chore: update go to 1.17.7 (influxdata#10658)
  fix: check for nil client before closing in amqp (influxdata#10635)
  fix: timestamp change during execution of json_v2 parser. (influxdata#10657)
  fix: bump github.com/signalfx/golib/v3 from 3.3.38 to 3.3.43 (influxdata#10652)
  fix: bump github.com/aliyun/alibaba-cloud-sdk-go (influxdata#10653)
  fix: incorrect handling of json_v2 timestamp_path (influxdata#10618)
  feat: gather additional stats from memcached (influxdata#10641)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10649)
  fix: Revert deprecation of http_listener_v2 (influxdata#10648)
  fix: bump github.com/denisenkom/go-mssqldb from 0.10.0 to 0.12.0 (influxdata#10503)
  fix: bump github.com/gopcua/opcua from 0.2.3 to 0.3.1 (influxdata#10626)
  fix: use current time as ecs timestamp (influxdata#10636)
  fix: bump github.com/nats-io/nats-server/v2 from 2.6.5 to 2.7.2 (influxdata#10638)
  chore: add -race flag to go tests (influxdata#10629)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10631)
  fix: license doc outdated causing CI failure (influxdata#10630)
  fix: bump k8s.io/client-go from 0.22.2 to 0.23.3 (influxdata#10589)
  feat: Implemented support for reading raw values, added tests and doc (influxdata#6501)
  fix: Improve parser tests by using go-cmp/cmp (influxdata#10497)
  feat(mongodb): add FsTotalSize and FsUsedSize informations (influxdata#10625)
  docs: update quay docs for auth (influxdata#10612)
  chore: allow downgrade of go version in windows script (influxdata#10614)
  chore: update CI go to 1.17.6 (influxdata#10611)
  feat: update etc/telegraf.conf and etc/telegraf_windows.conf (influxdata#10600)
  fix(inputs.opcua): add more data to error log (influxdata#10465)
  fix: bump github.com/aws/aws-sdk-go-v2/service/kinesis from 1.6.0 to 1.13.0 (influxdata#10601)
  refactor: use early return pattern (influxdata#10591)
  ...
MyaLongmire pushed a commit that referenced this pull request Jul 6, 2022
@powersj @MyaLongmire
fix: check for nil client before closing in amqp (#10635)
97f471f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@MyaLongmire MyaLongmire MyaLongmire approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

fix pr to fix corresponding bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Segfault with amqp plugin since 1.21.3 which also corrupts listening sockets

2 participants

@powersj @MyaLongmire