V2 Rmove existing unix domain socket on startup

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce 2020-04-20 11:52:47 -07:00
parent 06152434e6
commit 405e39b0d6
1 changed files with 19 additions and 0 deletions

View File

@ -2,8 +2,10 @@ package system
import ( import (
"fmt" "fmt"
"net/url"
"os" "os"
"path/filepath" "path/filepath"
"syscall"
"time" "time"
"github.com/containers/libpod/cmd/podman/registry" "github.com/containers/libpod/cmd/podman/registry"
@ -59,6 +61,23 @@ func service(cmd *cobra.Command, args []string) error {
} }
logrus.Infof("using API endpoint: '%s'", apiURI) logrus.Infof("using API endpoint: '%s'", apiURI)
// Clean up any old existing unix domain socket
if len(apiURI) > 0 {
uri, err := url.Parse(apiURI)
if err != nil {
return err
}
// socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer.
if "unix" == uri.Scheme && !registry.IsRemote() {
if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
return err
}
mask := syscall.Umask(0177)
defer syscall.Umask(mask)
}
}
opts := entities.ServiceOptions{ opts := entities.ServiceOptions{
URI: apiURI, URI: apiURI,
Timeout: time.Duration(srvArgs.Timeout) * time.Second, Timeout: time.Duration(srvArgs.Timeout) * time.Second,