summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-10-12 21:08:10 +0200
committerGitHub <noreply@github.com>2021-10-12 21:08:10 +0200
commit03095bd090e067ef1a2978a2107ec07ff3f95a2c (patch)
treea358550e152355529412e3247aeaefc2887db306 /cmd/podman
parent65e156467b5cc40e14a578a6d916e4df902d0a99 (diff)
parent0459484bdf51b3aabc51f2ae82136b6b0f3d88ba (diff)
downloadpodman-03095bd090e067ef1a2978a2107ec07ff3f95a2c.tar.gz
podman-03095bd090e067ef1a2978a2107ec07ff3f95a2c.tar.bz2
podman-03095bd090e067ef1a2978a2107ec07ff3f95a2c.zip
Merge pull request #11927 from jwhonce/issues/11921
Fix CI flake on time of shutdown for API service
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/system/service_abi.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index 0a4be6aea..b9bd7538f 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -93,7 +93,7 @@ func restService(flags *pflag.FlagSet, cfg *entities.PodmanConfig, opts entities
return err
}
defer func() {
- if err := server.Shutdown(false); err != nil {
+ if err := server.Shutdown(true); err != nil {
logrus.Warnf("Error when stopping API service: %s", err)
}
}()