feat: add daemon-socket-path

Signed-off-by: Gaius <gaius.qi@gmail.com>
dragonflyoss · Aug 3, 2022 · db8a011 · db8a011
1 parent 9b0fd1a
commit db8a011
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 8 deletions.
diff --git a/client/config/dfget.go b/client/config/dfget.go
@@ -70,6 +70,9 @@ type ClientOption struct {
 	// CallSystem system name that executes dfget.
 	CallSystem string `yaml:"callSystem,omitempty" mapstructure:"callSystem,omitempty"`
 
+	// DaemonSock is daemon download socket path.
+	DaemonSock string `yaml:"daemonSock,omitempty" mapstructure:"daemon-sock,omitempty"`
+
 	// Pattern download pattern, must be 'p2p' or 'seed-peer' or 'source',
 	// default:`p2p`.
 	Pattern string `yaml:"pattern,omitempty" mapstructure:"pattern,omitempty"`

diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go
@@ -369,13 +369,10 @@ func (cd *clientDaemon) Serve() error {
 	if cd.Option.Download.DownloadGRPC.UnixListen == nil {
 		return errors.New("download grpc unix listen option is empty")
 	}
-	if cd.Option.Download.DownloadGRPC.UnixListen.Socket == "" {
-		cd.Option.Download.DownloadGRPC.UnixListen.Socket = cd.dfpath.DaemonSockPath()
-	}
 	_ = os.Remove(cd.Option.Download.DownloadGRPC.UnixListen.Socket)
 	downloadListener, err := rpc.Listen(dfnet.NetAddr{
 		Type: dfnet.UNIX,
-		Addr: cd.Option.Download.DownloadGRPC.UnixListen.Socket,
+		Addr: cd.dfpath.DaemonSockPath(),
 	})
 	if err != nil {
 		logger.Errorf("failed to listen for download grpc service: %v", err)

diff --git a/cmd/dfget/cmd/daemon.go b/cmd/dfget/cmd/daemon.go
@@ -108,6 +108,10 @@ func initDaemonDfpath(cfg *config.DaemonOption) (dfpath.Dfpath, error) {
 		options = append(options, dfpath.WithLogDir(cfg.LogDir))
 	}
 
+	if cfg.Download.DownloadGRPC.UnixListen.Socket != "" {
+		options = append(options, dfpath.WithDownloadUnixSocketPath(cfg.Download.DownloadGRPC.UnixListen.Socket))
+	}
+
 	cacheDir := dfpath.DefaultCacheDir
 	if cfg.CacheDir != "" {
 		cacheDir = cfg.CacheDir

diff --git a/cmd/dfget/cmd/root.go b/cmd/dfget/cmd/root.go
@@ -164,6 +164,8 @@ func init() {
 
 	flagSet.String("callsystem", dfgetConfig.CallSystem, "The caller name which is mainly used for statistics and access control")
 
+	flagSet.String("daemon-sock", dfgetConfig.DaemonSock, "Download socket path of daemon. In linux, default value is /var/run/dfdaemon.sock, in macos(just for testing), default value is /tmp/dfdaemon.sock")
+
 	flagSet.String("workhome", dfgetConfig.WorkHome, "Dfget working directory")
 
 	flagSet.String("logdir", dfgetConfig.LogDir, "Dfget log directory")
@@ -205,6 +207,10 @@ func initDfgetDfpath(cfg *config.ClientOption) (dfpath.Dfpath, error) {
 		options = append(options, dfpath.WithLogDir(cfg.LogDir))
 	}
 
+	if cfg.DaemonSock != "" {
+		options = append(options, dfpath.WithDownloadUnixSocketPath(cfg.DaemonSock))
+	}
+
 	return dfpath.New(options...)
 }
 

diff --git a/pkg/dfpath/dfpath.go b/pkg/dfpath/dfpath.go
@@ -21,6 +21,7 @@ package dfpath
 import (
 	"io/fs"
 	"os"
+	"path"
 	"path/filepath"
 	"sync"
 
@@ -96,21 +97,28 @@ func WithPluginDir(dir string) Option {
 	}
 }
 
+// WithDownloadUnixSocketPath set unix socket path.
+func WithDownloadUnixSocketPath(path string) Option {
+	return func(d *dfpath) {
+		d.daemonSockPath = path
+	}
+}
+
 // New returns a new dfpath interface.
 func New(options ...Option) (Dfpath, error) {
 	cache.Do(func() {
 		d := &dfpath{
-			workHome:  DefaultWorkHome,
-			logDir:    DefaultLogDir,
-			pluginDir: DefaultPluginDir,
+			workHome:       DefaultWorkHome,
+			logDir:         DefaultLogDir,
+			pluginDir:      DefaultPluginDir,
+			daemonSockPath: DefaultDownloadUnixSocketPath,
 		}
 
 		for _, opt := range options {
 			opt(d)
 		}
 
 		// Initialize dfdaemon path.
-		d.daemonSockPath = filepath.Join(d.workHome, "daemon.sock")
 		d.daemonLockPath = filepath.Join(d.workHome, "daemon.lock")
 		d.dfgetLockPath = filepath.Join(d.workHome, "dfget.lock")
 
@@ -129,6 +137,11 @@ func New(options ...Option) (Dfpath, error) {
 			cache.err = multierror.Append(cache.err, err)
 		}
 
+		// Create unix socket directory.
+		if err := os.MkdirAll(path.Dir(d.daemonSockPath), fs.FileMode(0755)); err != nil {
+			cache.err = multierror.Append(cache.err, err)
+		}
+
 		// Create cache directory.
 		if d.cacheDir != "" {
 			if err := os.MkdirAll(d.cacheDir, fs.FileMode(0755)); err != nil {

diff --git a/pkg/dfpath/dfpath_darwin.go b/pkg/dfpath/dfpath_darwin.go
@@ -31,3 +31,4 @@ var DefaultConfigDir = filepath.Join(DefaultWorkHome, "config")
 var DefaultLogDir = filepath.Join(DefaultWorkHome, "logs")
 var DefaultDataDir = filepath.Join(DefaultWorkHome, "data")
 var DefaultPluginDir = filepath.Join(DefaultWorkHome, "plugins")
+var DefaultDownloadUnixSocketPath = filepath.Join(DefaultWorkHome, "dfdaemon.sock")
diff --git a/pkg/dfpath/dfpath_linux.go b/pkg/dfpath/dfpath_linux.go
@@ -25,3 +25,4 @@ var DefaultConfigDir = "/etc/dragonfly"
 var DefaultLogDir = "/var/log/dragonfly"
 var DefaultDataDir = "/var/lib/dragonfly"
 var DefaultPluginDir = "/usr/local/dragonfly/plugins"
+var DefaultDownloadUnixSocketPath = "/var/run/dfdaemon.sock"
diff --git a/pkg/dfpath/dfpath_test.go b/pkg/dfpath/dfpath_test.go
@@ -52,6 +52,7 @@ func TestNew(t *testing.T) {
 				assert.Equal(d.LogDir(), DefaultLogDir)
 				assert.Equal(d.DataDir(), "")
 				assert.Equal(d.PluginDir(), DefaultPluginDir)
+				assert.Equal(d.DaemonSockPath(), DefaultDownloadUnixSocketPath)
 			},
 		},
 		{
@@ -84,6 +85,7 @@ func TestNew(t *testing.T) {
 				assert.Equal(d.LogDir(), DefaultLogDir)
 				assert.Equal(d.DataDir(), "")
 				assert.Equal(d.PluginDir(), DefaultPluginDir)
+				assert.Equal(d.DaemonSockPath(), DefaultDownloadUnixSocketPath)
 			},
 		},
 		{
@@ -100,6 +102,7 @@ func TestNew(t *testing.T) {
 				assert.Equal(d.LogDir(), "foo")
 				assert.Equal(d.DataDir(), "")
 				assert.Equal(d.PluginDir(), DefaultPluginDir)
+				assert.Equal(d.DaemonSockPath(), DefaultDownloadUnixSocketPath)
 			},
 		},
 		{
@@ -116,6 +119,24 @@ func TestNew(t *testing.T) {
 				assert.Equal(d.LogDir(), DefaultLogDir)
 				assert.Equal(d.DataDir(), "")
 				assert.Equal(d.PluginDir(), "foo")
+				assert.Equal(d.DaemonSockPath(), DefaultDownloadUnixSocketPath)
+			},
+		},
+		{
+			name:    "new dfpath by daemonSockPath",
+			options: []Option{WithDownloadUnixSocketPath("foo")},
+			expect: func(t *testing.T, options []Option) {
+				assert := assert.New(t)
+				cache.Once = sync.Once{}
+				cache.err = &multierror.Error{}
+				d, err := New(options...)
+				assert.NoError(err)
+				assert.Equal(d.WorkHome(), DefaultWorkHome)
+				assert.Equal(d.CacheDir(), "")
+				assert.Equal(d.LogDir(), DefaultLogDir)
+				assert.Equal(d.DataDir(), "")
+				assert.Equal(d.PluginDir(), DefaultPluginDir)
+				assert.Equal(d.DaemonSockPath(), "foo")
 			},
 		},
 	}