Skip to content

Commit

Permalink
fix: ensure dbus connections are closed in (Try)RestartService
Browse files Browse the repository at this point in the history 
Related issue: harvester/harvester#6484

Signed-off-by: Tim Serong <[email protected]>
(cherry picked from commit 3069ce5)
  • Loading branch information
@tserong @mergify
tserong authored and mergify[bot] committed Sep 3, 2024
1 parent 3aa76c8 commit c90eeb6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ replace (
require (
github.com/ehazlett/simplelog v0.0.0-20200226020431-d374894e92a4
github.com/godbus/dbus/v5 v5.1.0
github.com/harvester/go-common v0.0.0-20240822134235-198df47889ca
github.com/harvester/go-common v0.0.0-20240903083523-9576346cda75
github.com/mudler/yip v1.1.0
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.16.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/harvester/go-common v0.0.0-20240822134235-198df47889ca h1:gUgeAQ9NSFEBqVkKJxTmbhbob/6CWu/iDlD4V40IpdU=
github.com/harvester/go-common v0.0.0-20240822134235-198df47889ca/go.mod h1:UNh9xAFqna6F2Fk4m4TTNWV0xaORlFwH7B+DepHT/gI=
github.com/harvester/go-common v0.0.0-20240903083523-9576346cda75 h1:zzh4ZWH1+4MPb9xwB0uhKfUF19OEZOFJJlMkKgKEyv8=
github.com/harvester/go-common v0.0.0-20240903083523-9576346cda75/go.mod h1:UNh9xAFqna6F2Fk4m4TTNWV0xaORlFwH7B+DepHT/gI=
github.com/harvester/webhook v0.1.4 h1:6g5MkYXlGm0wABQ/Dm8g5sM7WAtPq2aiWOH9wmf2vUQ=
github.com/harvester/webhook v0.1.4/go.mod h1:vfRPB26WHSPxMF/ONpUVzaEaewTUxpP9qAqu1ZyonR0=
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
Expand Down
2 changes: 2 additions & 0 deletions vendor/github.com/harvester/go-common/sys/systemd-dbus.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ github.com/google/uuid
# github.com/gorilla/mux v1.8.0
## explicit; go 1.12
github.com/gorilla/mux
# github.com/harvester/go-common v0.0.0-20240822134235-198df47889ca
# github.com/harvester/go-common v0.0.0-20240903083523-9576346cda75
## explicit; go 1.22
github.com/harvester/go-common/common
github.com/harvester/go-common/files
Expand Down

0 comments on commit c90eeb6

Please sign in to comment.