summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-17 23:18:48 +0100
committerGitHub <noreply@github.com>2020-11-17 23:18:48 +0100
commit8a0c3d878b13d86b97da188bda1fe580dbb07b8f (patch)
treed7fa4be266bd8a79008c45c8f357a856eb107003 /cmd/podman
parent0f745272e79daa496e541ff18bc6e21339559f38 (diff)
parentd3e794bda39167b15c5dc14d83333d1306316b11 (diff)
downloadpodman-8a0c3d878b13d86b97da188bda1fe580dbb07b8f.tar.gz
podman-8a0c3d878b13d86b97da188bda1fe580dbb07b8f.tar.bz2
podman-8a0c3d878b13d86b97da188bda1fe580dbb07b8f.zip
Merge pull request #8355 from baude/compatnetworkconnectdisconnect
add network connect|disconnect compat endpoints
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/system/service_abi.go27
1 files changed, 1 insertions, 26 deletions
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index 84f9293d4..8c52616be 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -5,12 +5,8 @@ package system
import (
"context"
"net"
- "os"
- "os/signal"
"strings"
- "github.com/containers/podman/v2/cmd/podman/utils"
- "github.com/containers/podman/v2/libpod"
api "github.com/containers/podman/v2/pkg/api/server"
"github.com/containers/podman/v2/pkg/domain/entities"
"github.com/containers/podman/v2/pkg/domain/infra"
@@ -43,7 +39,7 @@ func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entiti
return err
}
- startWatcher(rt)
+ infra.StartWatcher(rt)
server, err := api.NewServerWithSettings(rt, opts.Timeout, listener)
if err != nil {
return err
@@ -60,24 +56,3 @@ func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entiti
}
return err
}
-
-// startWatcher starts a new SIGHUP go routine for the current config.
-func startWatcher(rt *libpod.Runtime) {
- // Setup the signal notifier
- ch := make(chan os.Signal, 1)
- signal.Notify(ch, utils.SIGHUP)
-
- go func() {
- for {
- // Block until the signal is received
- logrus.Debugf("waiting for SIGHUP to reload configuration")
- <-ch
- if err := rt.Reload(); err != nil {
- logrus.Errorf("unable to reload configuration: %v", err)
- continue
- }
- }
- }()
-
- logrus.Debugf("registered SIGHUP watcher for config")
-}