summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-07-02 20:16:03 -0400
committerGitHub <noreply@github.com>2021-07-02 20:16:03 -0400
commit878a2231f9eae037d15bc27c50cdf3a9418793c7 (patch)
tree8611adc09be6ba26b9a5388e9e576a6b4dbdfc44 /cmd/podman
parentfc2f9cc3e6f923fcb09b83414e222574228ec94e (diff)
parented51e3f54898128e68330de395736c80868100e8 (diff)
downloadpodman-878a2231f9eae037d15bc27c50cdf3a9418793c7.tar.gz
podman-878a2231f9eae037d15bc27c50cdf3a9418793c7.tar.bz2
podman-878a2231f9eae037d15bc27c50cdf3a9418793c7.zip
Merge pull request #10851 from Luap99/service-reaper
podman service reaper
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/system/service_abi.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index d59a45564..e484db339 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -12,6 +12,7 @@ import (
api "github.com/containers/podman/v3/pkg/api/server"
"github.com/containers/podman/v3/pkg/domain/entities"
"github.com/containers/podman/v3/pkg/domain/infra"
+ "github.com/containers/podman/v3/pkg/servicereaper"
"github.com/containers/podman/v3/pkg/util"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
@@ -71,6 +72,8 @@ func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entiti
return err
}
+ servicereaper.Start()
+
infra.StartWatcher(rt)
server, err := api.NewServerWithSettings(rt, listener, api.Options{Timeout: opts.Timeout, CorsHeaders: opts.CorsHeaders})
if err != nil {