"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
mount: fix --daemon failing when --rc is enabled - fixes #9196
somaz4532a888387b
diff --git a/cmd/cmd.go b/cmd/cmd.goindex 792544e73..06a2d53fe 100644--- a/cmd/cmd.go+++ b/cmd/cmd.go@@ -379,6 +379,27 @@ func StartStats() func() {}}+var (+ rcServer *rcserver.Server+ metricsServer *rcserver.MetricsServer+)++// StopRemoteControl shuts down the remote control and metrics servers started by initConfig.+func StopRemoteControl() {+ if rcServer != nil {+ if err := rcServer.Shutdown(); err != nil {+ fs.Errorf(nil, "Failed to stop remote control: %v", err)+ }+ rcServer = nil+ }+ if metricsServer != nil {+ if err := metricsServer.Shutdown(); err != nil {+ fs.Errorf(nil, "Failed to stop metrics server: %v", err)+ }+ metricsServer = nil+ }+}+// initConfig is run by cobra after initialising the flagsfunc initConfig() {// Set the global options from the flags@@ -422,14 +443,14 @@ func initConfig() {}// Start the remote control server if configured- _, err = rcserver.Start(ctx, &rc.Opt)+ rcServer, err = rcserver.Start(ctx, &rc.Opt)if err != nil {fs.Fatalf(nil, "Failed to start remote control: %v", err)}// Start the metrics server if configured and not running the "rc" commandif len(os.Args) >= 2 && os.Args[1] != "rc" {- _, err = rcserver.MetricsStart(ctx, &rc.Opt)+ metricsServer, err = rcserver.MetricsStart(ctx, &rc.Opt)if err != nil {fs.Fatalf(nil, "Failed to start metrics server: %v", err)}diff --git a/cmd/cmd_test.go b/cmd/cmd_test.gonew file mode 100644index 000000000..2a802fe44--- /dev/null+++ b/cmd/cmd_test.go@@ -0,0 +1,52 @@+package cmd++import (+ "context"+ "net"+ "testing"++ "github.com/rclone/rclone/fs/rc"+ "github.com/rclone/rclone/fs/rc/rcserver"+ "github.com/stretchr/testify/assert"+ "github.com/stretchr/testify/require"+)++func freeAddr(t *testing.T) string {+ l, err := net.Listen("tcp", "127.0.0.1:0")+ require.NoError(t, err)+ addr := l.Addr().String()+ require.NoError(t, l.Close())+ return addr+}++func TestStopRemoteControl(t *testing.T) {+ ctx := context.Background()+ rcAddr, metricsAddr := freeAddr(t), freeAddr(t)+ opt := rc.Opt+ opt.Enabled = true+ opt.HTTP.ListenAddr = []string{rcAddr}+ opt.MetricsHTTP.ListenAddr = []string{metricsAddr}++ var err error+ rcServer, err = rcserver.Start(ctx, &opt)+ require.NoError(t, err)+ metricsServer, err = rcserver.MetricsStart(ctx, &opt)+ require.NoError(t, err)+ require.NotNil(t, rcServer)+ require.NotNil(t, metricsServer)++ for _, addr := range []string{rcAddr, metricsAddr} {+ _, err := net.Listen("tcp", addr)+ require.Error(t, err, "%s should be in use while the servers run", addr)+ }++ StopRemoteControl()+ assert.Nil(t, rcServer)+ assert.Nil(t, metricsServer)++ for _, addr := range []string{rcAddr, metricsAddr} {+ l, err := net.Listen("tcp", addr)+ require.NoError(t, err, "%s should be free after StopRemoteControl", addr)+ require.NoError(t, l.Close())+ }+}diff --git a/cmd/mountlib/mount.go b/cmd/mountlib/mount.goindex 10ae5eb8e..b46b23565 100644--- a/cmd/mountlib/mount.go+++ b/cmd/mountlib/mount.go@@ -309,6 +309,10 @@ func NewMountCommand(commandName string, hidden bool, mount MountFn) *cobra.Commif Opt.Daemon {config.PassConfigKeyForDaemonization = true+ if !fs.IsDaemon() {+ // The daemon child starts these servers on the same addresses+ cmd.StopRemoteControl()+ }}if os.Getenv("PATH") == "" && runtime.GOOS != "windows" {