"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
build: update logging statements to make json log work - fixes #6038
albertonybcdfad3c8372
diff --git a/backend/cache/cache_internal_test.go b/backend/cache/cache_internal_test.goindex 3bbf46647..6092a1a1d 100644--- a/backend/cache/cache_internal_test.go+++ b/backend/cache/cache_internal_test.go@@ -10,7 +10,6 @@ import (goflag "flag""fmt""io"- "log""math/rand""os""path"@@ -93,7 +92,7 @@ func TestMain(m *testing.M) {goflag.Parse()var rc int- log.Printf("Running with the following params: \n remote: %v", remoteName)+ fs.Logf(nil, "Running with the following params: \n remote: %v", remoteName)runInstance = newRun()rc = m.Run()os.Exit(rc)@@ -408,7 +407,7 @@ func TestInternalWrappedFsChangeNotSeen(t *testing.T) {// update in the wrapped fsoriginalSize, err := runInstance.size(t, rootFs, "data.bin")require.NoError(t, err)- log.Printf("original size: %v", originalSize)+ fs.Logf(nil, "original size: %v", originalSize)o, err := cfs.UnWrap().NewObject(context.Background(), runInstance.encryptRemoteIfNeeded(t, "data.bin"))require.NoError(t, err)@@ -425,7 +424,7 @@ func TestInternalWrappedFsChangeNotSeen(t *testing.T) {err = o.Update(context.Background(), bytes.NewReader(data2), objInfo)require.NoError(t, err)require.Equal(t, int64(len(data2)), o.Size())- log.Printf("updated size: %v", len(data2))+ fs.Logf(nil, "updated size: %v", len(data2))// get a new instance from the cacheif runInstance.wrappedIsExternal {@@ -485,49 +484,49 @@ func TestInternalMoveWithNotify(t *testing.T) {err = runInstance.retryBlock(func() error {li, err := runInstance.list(t, rootFs, "test")if err != nil {- log.Printf("err: %v", err)+ fs.Logf(nil, "err: %v", err)return err}if len(li) != 2 {- log.Printf("not expected listing /test: %v", li)+ fs.Logf(nil, "not expected listing /test: %v", li)return fmt.Errorf("not expected listing /test: %v", li)}li, err = runInstance.list(t, rootFs, "test/one")if err != nil {- log.Printf("err: %v", err)+ fs.Logf(nil, "err: %v", err)return err}if len(li) != 0 {- log.Printf("not expected listing /test/one: %v", li)+ fs.Logf(nil, "not expected listing /test/one: %v", li)return fmt.Errorf("not expected listing /test/one: %v", li)}li, err = runInstance.list(t, rootFs, "test/second")if err != nil {- log.Printf("err: %v", err)+ fs.Logf(nil, "err: %v", err)return err}if len(li) != 1 {- log.Printf("not expected listing /test/second: %v", li)+ fs.Logf(nil, "not expected listing /test/second: %v", li)return fmt.Errorf("not expected listing /test/second: %v", li)}if fi, ok := li[0].(os.FileInfo); ok {if fi.Name() != "data.bin" {- log.Printf("not expected name: %v", fi.Name())+ fs.Logf(nil, "not expected name: %v", fi.Name())return fmt.Errorf("not expected name: %v", fi.Name())}} else if di, ok := li[0].(fs.DirEntry); ok {if di.Remote() != "test/second/data.bin" {- log.Printf("not expected remote: %v", di.Remote())+ fs.Logf(nil, "not expected remote: %v", di.Remote())return fmt.Errorf("not expected remote: %v", di.Remote())}} else {- log.Printf("unexpected listing: %v", li)+ fs.Logf(nil, "unexpected listing: %v", li)return fmt.Errorf("unexpected listing: %v", li)}- log.Printf("complete listing: %v", li)+ fs.Logf(nil, "complete listing: %v", li)return nil}, 12, time.Second*10)require.NoError(t, err)@@ -577,43 +576,43 @@ func TestInternalNotifyCreatesEmptyParts(t *testing.T) {err = runInstance.retryBlock(func() error {found = boltDb.HasEntry(path.Join(cfs.Root(), runInstance.encryptRemoteIfNeeded(t, "test")))if !found {- log.Printf("not found /test")+ fs.Logf(nil, "not found /test")return fmt.Errorf("not found /test")}found = boltDb.HasEntry(path.Join(cfs.Root(), runInstance.encryptRemoteIfNeeded(t, "test"), runInstance.encryptRemoteIfNeeded(t, "one")))if !found {- log.Printf("not found /test/one")+ fs.Logf(nil, "not found /test/one")return fmt.Errorf("not found /test/one")}found = boltDb.HasEntry(path.Join(cfs.Root(), runInstance.encryptRemoteIfNeeded(t, "test"), runInstance.encryptRemoteIfNeeded(t, "one"), runInstance.encryptRemoteIfNeeded(t, "test2")))if !found {- log.Printf("not found /test/one/test2")+ fs.Logf(nil, "not found /test/one/test2")return fmt.Errorf("not found /test/one/test2")}li, err := runInstance.list(t, rootFs, "test/one")if err != nil {- log.Printf("err: %v", err)+ fs.Logf(nil, "err: %v", err)return err}if len(li) != 1 {- log.Printf("not expected listing /test/one: %v", li)+ fs.Logf(nil, "not expected listing /test/one: %v", li)return fmt.Errorf("not expected listing /test/one: %v", li)}if fi, ok := li[0].(os.FileInfo); ok {if fi.Name() != "test2" {- log.Printf("not expected name: %v", fi.Name())+ fs.Logf(nil, "not expected name: %v", fi.Name())return fmt.Errorf("not expected name: %v", fi.Name())}} else if di, ok := li[0].(fs.DirEntry); ok {if di.Remote() != "test/one/test2" {- log.Printf("not expected remote: %v", di.Remote())+ fs.Logf(nil, "not expected remote: %v", di.Remote())return fmt.Errorf("not expected remote: %v", di.Remote())}} else {- log.Printf("unexpected listing: %v", li)+ fs.Logf(nil, "unexpected listing: %v", li)return fmt.Errorf("unexpected listing: %v", li)}- log.Printf("complete listing /test/one/test2")+ fs.Logf(nil, "complete listing /test/one/test2")return nil}, 12, time.Second*10)require.NoError(t, err)@@ -771,24 +770,24 @@ func TestInternalBug2117(t *testing.T) {di, err := runInstance.list(t, rootFs, "test/dir1/dir2")require.NoError(t, err)- log.Printf("len: %v", len(di))+ fs.Logf(nil, "len: %v", len(di))require.Len(t, di, 1)time.Sleep(time.Second * 30)di, err = runInstance.list(t, rootFs, "test/dir1/dir2")require.NoError(t, err)- log.Printf("len: %v", len(di))+ fs.Logf(nil, "len: %v", len(di))require.Len(t, di, 1)di, err = runInstance.list(t, rootFs, "test/dir1")require.NoError(t, err)- log.Printf("len: %v", len(di))+ fs.Logf(nil, "len: %v", len(di))require.Len(t, di, 4)di, err = runInstance.list(t, rootFs, "test")require.NoError(t, err)- log.Printf("len: %v", len(di))+ fs.Logf(nil, "len: %v", len(di))require.Len(t, di, 4)}@@ -829,7 +828,7 @@ func newRun() *run {} else {r.tmpUploadDir = uploadDir}- log.Printf("Temp Upload Dir: %v", r.tmpUploadDir)+ fs.Logf(nil, "Temp Upload Dir: %v", r.tmpUploadDir)return r}diff --git a/backend/yandex/yandex.go b/backend/yandex/yandex.goindex aabb2f8db..7171491ea 100644--- a/backend/yandex/yandex.go+++ b/backend/yandex/yandex.go@@ -7,7 +7,6 @@ import ("errors""fmt""io"- "log""net/http""net/url""path"@@ -283,7 +282,7 @@ func NewFs(ctx context.Context, name, root string, m configmap.Mapper) (fs.Fs, eif err != nil {return nil, fmt.Errorf("couldn't save OAuth token: %w", err)}- log.Printf("Automatically upgraded OAuth config.")+ fs.Logf(nil, "Automatically upgraded OAuth config.")}oAuthClient, _, err := oauthutil.NewClient(ctx, name, m, oauthConfig)if err != nil {diff --git a/bin/not-in-stable.go b/bin/not-in-stable.goindex dc685cb6f..57a025760 100644--- a/bin/not-in-stable.go+++ b/bin/not-in-stable.go@@ -29,7 +29,7 @@ func readCommits(from, to string) (logMap map[string]string, logs []string) {cmd := exec.Command("git", "log", "--oneline", from+".."+to)out, err := cmd.Output()if err != nil {- log.Fatalf("failed to run git log %s: %v", from+".."+to, err)+ log.Fatalf("failed to run git log %s: %v", from+".."+to, err) //nolint:gocritic // Don't include gocritic when running golangci-lint to avoid ruleguard suggesting fs. intead of log.}logMap = map[string]string{}logs = []string{}@@ -39,7 +39,7 @@ func readCommits(from, to string) (logMap map[string]string, logs []string) {}match := logRe.FindSubmatch(line)if match == nil {- log.Fatalf("failed to parse line: %q", line)+ log.Fatalf("failed to parse line: %q", line) //nolint:gocritic // Don't include gocritic when running golangci-lint to avoid ruleguard suggesting fs. intead of log.}var hash, logMessage = string(match[1]), string(match[2])logMap[logMessage] = hash@@ -52,12 +52,12 @@ func main() {flag.Parse()args := flag.Args()if len(args) != 0 {- log.Fatalf("Syntax: %s", os.Args[0])+ log.Fatalf("Syntax: %s", os.Args[0]) //nolint:gocritic // Don't include gocritic when running golangci-lint to avoid ruleguard suggesting fs. intead of log.}// v1.54.0versionBytes, err := os.ReadFile("VERSION")if err != nil {- log.Fatalf("Failed to read version: %v", err)+ log.Fatalf("Failed to read version: %v", err) //nolint:gocritic // Don't include gocritic when running golangci-lint to avoid ruleguard suggesting fs. intead of log.}if versionBytes[0] == 'v' {versionBytes = versionBytes[1:]@@ -65,7 +65,7 @@ func main() {versionBytes = bytes.TrimSpace(versionBytes)semver := semver.New(string(versionBytes))stable := fmt.Sprintf("v%d.%d", semver.Major, semver.Minor-1)- log.Printf("Finding commits in %v not in stable %s", semver, stable)+ log.Printf("Finding commits in %v not in stable %s", semver, stable) //nolint:gocritic // Don't include gocritic when running golangci-lint to avoid ruleguard suggesting fs. intead of log.masterMap, masterLogs := readCommits(stable+".0", "master")stableMap, _ := readCommits(stable+".0", stable+"-stable")for _, logMessage := range masterLogs {diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.goindex ba1e313e5..bc359bbd3 100644--- a/cmd/bisync/bisync_test.go+++ b/cmd/bisync/bisync_test.go@@ -10,7 +10,6 @@ import ("errors""flag""fmt"- "log""os""path""path/filepath"@@ -232,7 +231,7 @@ func TestBisyncRemoteLocal(t *testing.T) {t.Skip("path1 and path2 are the same remote")}_, remote, cleanup, err := fstest.RandomRemote()- log.Printf("remote: %v", remote)+ fs.Logf(nil, "remote: %v", remote)require.NoError(t, err)defer cleanup()testBisync(t, remote, *argRemote2)@@ -244,7 +243,7 @@ func TestBisyncLocalRemote(t *testing.T) {t.Skip("path1 and path2 are the same remote")}_, remote, cleanup, err := fstest.RandomRemote()- log.Printf("remote: %v", remote)+ fs.Logf(nil, "remote: %v", remote)require.NoError(t, err)defer cleanup()testBisync(t, *argRemote2, remote)@@ -254,7 +253,7 @@ func TestBisyncLocalRemote(t *testing.T) {// (useful for testing server-side copy/move)func TestBisyncRemoteRemote(t *testing.T) {_, remote, cleanup, err := fstest.RandomRemote()- log.Printf("remote: %v", remote)+ fs.Logf(nil, "remote: %v", remote)require.NoError(t, err)defer cleanup()testBisync(t, remote, remote)@@ -450,13 +449,13 @@ func (b *bisyncTest) runTestCase(ctx context.Context, t *testing.T, testCase strfor _, dir := range srcDirs {dirs = append(dirs, norm.NFC.String(dir.Remote()))}- log.Printf("checking initFs %s", initFs)+ fs.Logf(nil, "checking initFs %s", initFs)fstest.CheckListingWithPrecision(b.t, initFs, items, dirs, initFs.Precision())checkError(b.t, sync.CopyDir(ctxNoDsStore, b.fs1, initFs, true), "setting up path1")- log.Printf("checking Path1 %s", b.fs1)+ fs.Logf(nil, "checking Path1 %s", b.fs1)fstest.CheckListingWithPrecision(b.t, b.fs1, items, dirs, b.fs1.Precision())checkError(b.t, sync.CopyDir(ctxNoDsStore, b.fs2, initFs, true), "setting up path2")- log.Printf("checking path2 %s", b.fs2)+ fs.Logf(nil, "checking path2 %s", b.fs2)fstest.CheckListingWithPrecision(b.t, b.fs2, items, dirs, b.fs2.Precision())// Create log file@@ -514,21 +513,21 @@ func (b *bisyncTest) runTestCase(ctx context.Context, t *testing.T, testCase strrequire.NoError(b.t, err, "saving log file %s", savedLog)if b.golden && !b.stopped {- log.Printf("Store results to golden directory")+ fs.Logf(nil, "Store results to golden directory")b.storeGolden()return}errorCount := 0if b.noCompare {- log.Printf("Skip comparing results with golden directory")+ fs.Logf(nil, "Skip comparing results with golden directory")errorCount = -2} else {errorCount = b.compareResults()}if b.noCleanup {- log.Printf("Skip cleanup")+ fs.Logf(nil, "Skip cleanup")} else {b.cleanupCase(ctx)}@@ -1383,24 +1382,24 @@ func (b *bisyncTest) compareResults() int {const divider = "----------------------------------------------------------"if goldenNum != resultNum {- log.Print(divider)- log.Print(color(terminal.RedFg, "MISCOMPARE - Number of Golden and Results files do not match:"))- log.Printf(" Golden count: %d", goldenNum)- log.Printf(" Result count: %d", resultNum)- log.Printf(" Golden files: %s", strings.Join(goldenFiles, ", "))- log.Printf(" Result files: %s", strings.Join(resultFiles, ", "))+ fs.Log(nil, divider)+ fs.Log(nil, color(terminal.RedFg, "MISCOMPARE - Number of Golden and Results files do not match:"))+ fs.Logf(nil, " Golden count: %d", goldenNum)+ fs.Logf(nil, " Result count: %d", resultNum)+ fs.Logf(nil, " Golden files: %s", strings.Join(goldenFiles, ", "))+ fs.Logf(nil, " Result files: %s", strings.Join(resultFiles, ", "))}for _, file := range goldenFiles {if !resultSet.Has(file) {errorCount++- log.Printf(" File found in Golden but not in Results: %s", file)+ fs.Logf(nil, " File found in Golden but not in Results: %s", file)}}for _, file := range resultFiles {if !goldenSet.Has(file) {errorCount++- log.Printf(" File found in Results but not in Golden: %s", file)+ fs.Logf(nil, " File found in Results but not in Golden: %s", file)}}@@ -1433,15 +1432,15 @@ func (b *bisyncTest) compareResults() int {text, err := difflib.GetUnifiedDiffString(diff)require.NoError(b.t, err, "diff failed")- log.Print(divider)- log.Printf(color(terminal.RedFg, "| MISCOMPARE -Golden vs +Results for %s"), file)+ fs.Log(nil, divider)+ fs.Logf(nil, color(terminal.RedFg, "| MISCOMPARE -Golden vs +Results for %s"), file)for _, line := range strings.Split(strings.TrimSpace(text), "\n") {- log.Printf("| %s", strings.TrimSpace(line))+ fs.Logf(nil, "| %s", strings.TrimSpace(line))}}if errorCount > 0 {- log.Print(divider)+ fs.Log(nil, divider)}if errorCount == 0 && goldenNum != resultNum {return -1@@ -1464,7 +1463,7 @@ func (b *bisyncTest) storeGolden() {continue}if fileName == "backupdirs" {- log.Printf("skipping: %v", fileName)+ fs.Logf(nil, "skipping: %v", fileName)continue}goldName := b.toGolden(fileName)@@ -1489,7 +1488,7 @@ func (b *bisyncTest) storeGolden() {continue}if fileName == "backupdirs" {- log.Printf("skipping: %v", fileName)+ fs.Logf(nil, "skipping: %v", fileName)continue}text := b.mangleResult(b.goldenDir, fileName, true)@@ -1849,7 +1848,7 @@ func fileType(fileName string) string {// logPrintf prints a message to stdout and to the test logfunc (b *bisyncTest) logPrintf(text string, args ...interface{}) {line := fmt.Sprintf(text, args...)- log.Print(line)+ fs.Log(nil, line)if b.logFile != nil {_, err := fmt.Fprintln(b.logFile, line)require.NoError(b.t, err, "writing log file")diff --git a/cmd/cat/cat.go b/cmd/cat/cat.goindex 9961dc222..c2325dd4c 100644--- a/cmd/cat/cat.go+++ b/cmd/cat/cat.go@@ -4,11 +4,11 @@ package catimport ("context""io"- "log""os""strings""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/flags""github.com/rclone/rclone/fs/operations""github.com/spf13/cobra"@@ -79,7 +79,7 @@ files, use:usedHead := head > 0usedTail := tail > 0if usedHead && usedTail || usedHead && usedOffset || usedTail && usedOffset {- log.Fatalf("Can only use one of --head, --tail or --offset with --count")+ fs.Fatalf(nil, "Can only use one of --head, --tail or --offset with --count")}if head > 0 {offset = 0diff --git a/cmd/cmd.go b/cmd/cmd.goindex 24e8e5160..d190dcbcb 100644--- a/cmd/cmd.go+++ b/cmd/cmd.go@@ -10,7 +10,6 @@ import ("context""errors""fmt"- "log""os""os/exec""path"@@ -88,7 +87,7 @@ func NewFsFile(remote string) (fs.Fs, string) {_, fsPath, err := fspath.SplitFs(remote)if err != nil {err = fs.CountError(err)- log.Fatalf("Failed to create file system for %q: %v", remote, err)+ fs.Fatalf(nil, "Failed to create file system for %q: %v", remote, err)}f, err := cache.Get(context.Background(), remote)switch err {@@ -100,7 +99,7 @@ func NewFsFile(remote string) (fs.Fs, string) {return f, ""default:err = fs.CountError(err)- log.Fatalf("Failed to create file system for %q: %v", remote, err)+ fs.Fatalf(nil, "Failed to create file system for %q: %v", remote, err)}return nil, ""}@@ -116,13 +115,13 @@ func newFsFileAddFilter(remote string) (fs.Fs, string) {if !fi.InActive() {err := fmt.Errorf("can't limit to single files when using filters: %v", remote)err = fs.CountError(err)- log.Fatal(err.Error())+ fs.Fatal(nil, err.Error())}// Limit transfers to this fileerr := fi.AddFile(fileName)if err != nil {err = fs.CountError(err)- log.Fatalf("Failed to limit to single file %q: %v", remote, err)+ fs.Fatalf(nil, "Failed to limit to single file %q: %v", remote, err)}}return f, fileName@@ -144,7 +143,7 @@ func newFsDir(remote string) fs.Fs {f, err := cache.Get(context.Background(), remote)if err != nil {err = fs.CountError(err)- log.Fatalf("Failed to create file system for %q: %v", remote, err)+ fs.Fatalf(nil, "Failed to create file system for %q: %v", remote, err)}cache.Pin(f) // pin indefinitely since it was on the CLIreturn f@@ -186,24 +185,24 @@ func NewFsSrcDstFiles(args []string) (fsrc fs.Fs, srcFileName string, fdst fs.Fsvar err errordstRemote, dstFileName, err = fspath.Split(dstRemote)if err != nil {- log.Fatalf("Parsing %q failed: %v", args[1], err)+ fs.Fatalf(nil, "Parsing %q failed: %v", args[1], err)}if dstRemote == "" {dstRemote = "."}if dstFileName == "" {- log.Fatalf("%q is a directory", args[1])+ fs.Fatalf(nil, "%q is a directory", args[1])}}fdst, err := cache.Get(context.Background(), dstRemote)switch err {case fs.ErrorIsFile:_ = fs.CountError(err)- log.Fatalf("Source doesn't exist or is a directory and destination is a file")+ fs.Fatalf(nil, "Source doesn't exist or is a directory and destination is a file")case nil:default:_ = fs.CountError(err)- log.Fatalf("Failed to create file system for destination %q: %v", dstRemote, err)+ fs.Fatalf(nil, "Failed to create file system for destination %q: %v", dstRemote, err)}cache.Pin(fdst) // pin indefinitely since it was on the CLIreturn@@ -213,13 +212,13 @@ func NewFsSrcDstFiles(args []string) (fsrc fs.Fs, srcFileName string, fdst fs.Fsfunc NewFsDstFile(args []string) (fdst fs.Fs, dstFileName string) {dstRemote, dstFileName, err := fspath.Split(args[0])if err != nil {- log.Fatalf("Parsing %q failed: %v", args[0], err)+ fs.Fatalf(nil, "Parsing %q failed: %v", args[0], err)}if dstRemote == "" {dstRemote = "."}if dstFileName == "" {- log.Fatalf("%q is a directory", args[0])+ fs.Fatalf(nil, "%q is a directory", args[0])}fdst = newFsDir(dstRemote)return@@ -328,9 +327,9 @@ func Run(Retry bool, showStats bool, cmd *cobra.Command, f func() error) {if cmdErr != nil {nerrs := accounting.GlobalStats().GetErrors()if nerrs <= 1 {- log.Printf("Failed to %s: %v", cmd.Name(), cmdErr)+ fs.Logf(nil, "Failed to %s: %v", cmd.Name(), cmdErr)} else {- log.Printf("Failed to %s with %d errors: last error was: %v", cmd.Name(), nerrs, cmdErr)+ fs.Logf(nil, "Failed to %s with %d errors: last error was: %v", cmd.Name(), nerrs, cmdErr)}}resolveExitCode(cmdErr)@@ -383,7 +382,7 @@ func initConfig() {// Set the global options from the flagserr := fs.GlobalOptionsInit()if err != nil {- log.Fatalf("Failed to initialise global options: %v", err)+ fs.Fatalf(nil, "Failed to initialise global options: %v", err)}ctx := context.Background()@@ -423,7 +422,7 @@ func initConfig() {// Start the remote control server if configured_, err = rcserver.Start(ctx, &rc.Opt)if err != nil {- log.Fatalf("Failed to start remote control: %v", err)+ fs.Fatalf(nil, "Failed to start remote control: %v", err)}// Start the metrics server if configured@@ -439,19 +438,19 @@ func initConfig() {f, err := os.Create(*cpuProfile)if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}err = pprof.StartCPUProfile(f)if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}atexit.Register(func() {pprof.StopCPUProfile()err := f.Close()if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}})}@@ -463,17 +462,17 @@ func initConfig() {f, err := os.Create(*memProfile)if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}err = pprof.WriteHeapProfile(f)if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}err = f.Close()if err != nil {err = fs.CountError(err)- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}})}@@ -537,6 +536,6 @@ func Main() {if strings.HasPrefix(err.Error(), "unknown command") && selfupdateEnabled {Root.PrintErrf("You could use '%s selfupdate' to get latest features.\n\n", Root.CommandPath())}- log.Fatalf("Fatal error: %v", err)+ fs.Fatalf(nil, "Fatal error: %v", err)}}diff --git a/cmd/dedupe/dedupe.go b/cmd/dedupe/dedupe.goindex 38c6e41a0..e280306ec 100644--- a/cmd/dedupe/dedupe.go+++ b/cmd/dedupe/dedupe.go@@ -3,7 +3,7 @@ package dedupeimport ("context"- "log"+ "fmt""github.com/rclone/rclone/cmd""github.com/rclone/rclone/fs"@@ -142,7 +142,7 @@ Orif len(args) > 1 {err := dedupeMode.Set(args[0])if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}args = args[1:]}diff --git a/cmd/genautocomplete/genautocomplete_bash.go b/cmd/genautocomplete/genautocomplete_bash.goindex f9eb83a68..e4c08d662 100644--- a/cmd/genautocomplete/genautocomplete_bash.go+++ b/cmd/genautocomplete/genautocomplete_bash.go@@ -1,10 +1,11 @@package genautocompleteimport (- "log"+ "fmt""os""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/spf13/cobra")@@ -50,7 +51,7 @@ current shell.if args[0] == "-" {err := cmd.Root.GenBashCompletionV2(os.Stdout, false)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}return}@@ -58,7 +59,7 @@ current shell.}err := cmd.Root.GenBashCompletionFileV2(out, false)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}},}diff --git a/cmd/genautocomplete/genautocomplete_fish.go b/cmd/genautocomplete/genautocomplete_fish.goindex 8a419fb91..e8a8014e2 100644--- a/cmd/genautocomplete/genautocomplete_fish.go+++ b/cmd/genautocomplete/genautocomplete_fish.go@@ -1,10 +1,11 @@package genautocompleteimport (- "log"+ "fmt""os""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/spf13/cobra")@@ -39,7 +40,7 @@ If output_file is "-", then the output will be written to stdout.if args[0] == "-" {err := cmd.Root.GenFishCompletion(os.Stdout, true)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}return}@@ -47,7 +48,7 @@ If output_file is "-", then the output will be written to stdout.}err := cmd.Root.GenFishCompletionFile(out, true)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}},}diff --git a/cmd/genautocomplete/genautocomplete_powershell.go b/cmd/genautocomplete/genautocomplete_powershell.goindex e07bd70b6..0fda7d730 100644--- a/cmd/genautocomplete/genautocomplete_powershell.go+++ b/cmd/genautocomplete/genautocomplete_powershell.go@@ -1,10 +1,11 @@package genautocompleteimport (- "log"+ "fmt""os""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/spf13/cobra")@@ -31,13 +32,13 @@ If output_file is "-" or missing, then the output will be written to stdout.if len(args) == 0 || (len(args) > 0 && args[0] == "-") {err := cmd.Root.GenPowerShellCompletion(os.Stdout)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}return}err := cmd.Root.GenPowerShellCompletionFile(args[0])if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}},}diff --git a/cmd/genautocomplete/genautocomplete_zsh.go b/cmd/genautocomplete/genautocomplete_zsh.goindex 23333fb7c..ef80254e8 100644--- a/cmd/genautocomplete/genautocomplete_zsh.go+++ b/cmd/genautocomplete/genautocomplete_zsh.go@@ -1,10 +1,11 @@package genautocompleteimport (- "log"+ "fmt""os""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/spf13/cobra")@@ -39,7 +40,7 @@ If output_file is "-", then the output will be written to stdout.if args[0] == "-" {err := cmd.Root.GenZshCompletion(os.Stdout)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}return}@@ -47,12 +48,12 @@ If output_file is "-", then the output will be written to stdout.}outFile, err := os.Create(out)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}defer func() { _ = outFile.Close() }()err = cmd.Root.GenZshCompletion(outFile)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}},}diff --git a/cmd/gendocs/gendocs.go b/cmd/gendocs/gendocs.goindex 5864283db..ffd6e23fd 100644--- a/cmd/gendocs/gendocs.go+++ b/cmd/gendocs/gendocs.go@@ -4,7 +4,6 @@ package gendocsimport ("bytes""fmt"- "log""os""path""path/filepath"@@ -14,6 +13,7 @@ import ("time""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/flags""github.com/rclone/rclone/lib/file""github.com/spf13/cobra"@@ -144,7 +144,7 @@ rclone.org website.`,var buf bytes.Buffererr := frontmatterTemplate.Execute(&buf, data)if err != nil {- log.Fatalf("Failed to render frontmatter template: %v", err)+ fs.Fatalf(nil, "Failed to render frontmatter template: %v", err)}return buf.String()}diff --git a/cmd/help.go b/cmd/help.goindex 55c89ea8a..c9906d684 100644--- a/cmd/help.go+++ b/cmd/help.go@@ -3,7 +3,6 @@ package cmdimport ("context""fmt"- "log""os""regexp""sort"@@ -76,7 +75,7 @@ var helpFlags = &cobra.Command{if len(args) > 0 {re, err := filter.GlobStringToRegexp(args[0], false, true)if err != nil {- log.Fatalf("Invalid flag filter: %v", err)+ fs.Fatalf(nil, "Invalid flag filter: %v", err)}fs.Debugf(nil, "Flag filter: %s", re.String())filterFlagsRe = re@@ -286,7 +285,7 @@ func quoteString(v interface{}) string {func showBackend(name string) {backend, err := fs.Find(name)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}var standardOptions, advancedOptions fs.Optionsdone := map[string]struct{}{}diff --git a/cmd/mount2/mount.go b/cmd/mount2/mount.goindex 4548705a5..012142a29 100644--- a/cmd/mount2/mount.go+++ b/cmd/mount2/mount.go@@ -5,7 +5,6 @@ package mount2import ("fmt"- "log""runtime""time"@@ -150,7 +149,7 @@ func mountOptions(fsys *FS, f fs.Fs, opt *mountlib.Options) (mountOpts *fuse.Mouopts = append(opts, "ro")}if fsys.opt.WritebackCache {- log.Printf("FIXME --write-back-cache not supported")+ fs.Printf(nil, "FIXME --write-back-cache not supported")// FIXME opts = append(opts,fuse.WritebackCache())}// Some OS X only optionsdiff --git a/cmd/mountlib/mount.go b/cmd/mountlib/mount.goindex 0e5419398..275d5a434 100644--- a/cmd/mountlib/mount.go+++ b/cmd/mountlib/mount.go@@ -5,7 +5,6 @@ import ("context"_ "embed""fmt"- "log""os""runtime""strings"@@ -311,7 +310,7 @@ func NewMountCommand(commandName string, hidden bool, mount MountFn) *cobra.Commerr = mnt.Wait()}if err != nil {- log.Fatalf("Fatal error: %v", err)+ fs.Fatalf(nil, "Fatal error: %v", err)}return}@@ -339,7 +338,7 @@ func NewMountCommand(commandName string, hidden bool, mount MountFn) *cobra.Commatexit.Unregister(handle)}if err != nil {- log.Fatalf("Fatal error: %v", err)+ fs.Fatalf(nil, "Fatal error: %v", err)}},}diff --git a/cmd/mountlib/rc.go b/cmd/mountlib/rc.goindex a896e8c5f..8c5c94d5d 100644--- a/cmd/mountlib/rc.go+++ b/cmd/mountlib/rc.go@@ -3,7 +3,6 @@ package mountlibimport ("context""errors"- "log""sort""sync""time"@@ -123,12 +122,12 @@ func mountRc(ctx context.Context, in rc.Params) (out rc.Params, err error) {mnt := NewMountPoint(mountFn, mountPoint, fdst, &mountOpt, &vfsOpt)_, err = mnt.Mount()if err != nil {- log.Printf("mount FAILED: %v", err)+ fs.Logf(nil, "mount FAILED: %v", err)return nil, err}go func() {if err = mnt.Wait(); err != nil {- log.Printf("unmount FAILED: %v", err)+ fs.Logf(nil, "unmount FAILED: %v", err)return}mountMu.Lock()diff --git a/cmd/rcat/rcat.go b/cmd/rcat/rcat.goindex bb53c2a23..3d767d115 100644--- a/cmd/rcat/rcat.go+++ b/cmd/rcat/rcat.go@@ -3,11 +3,11 @@ package rcatimport ("context"- "log""os""time""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/flags""github.com/rclone/rclone/fs/operations""github.com/spf13/cobra"@@ -64,7 +64,7 @@ destination which can use retries.`,stat, _ := os.Stdin.Stat()if (stat.Mode() & os.ModeCharDevice) != 0 {- log.Fatalf("nothing to read from standard input (stdin).")+ fs.Fatalf(nil, "nothing to read from standard input (stdin).")}fdst, dstFileName := cmd.NewFsDstFile(args)diff --git a/cmd/rcd/rcd.go b/cmd/rcd/rcd.goindex 1dc875d28..391a63321 100644--- a/cmd/rcd/rcd.go+++ b/cmd/rcd/rcd.go@@ -3,9 +3,9 @@ package rcdimport ("context"- "log""github.com/rclone/rclone/cmd"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/rc""github.com/rclone/rclone/fs/rc/rcflags""github.com/rclone/rclone/fs/rc/rcserver"@@ -39,7 +39,7 @@ See the [rc documentation](/rc/) for more info on the rc flags.Run: func(command *cobra.Command, args []string) {cmd.CheckArgs(0, 1, command, args)if rc.Opt.Enabled {- log.Fatalf("Don't supply --rc flag when using rcd")+ fs.Fatalf(nil, "Don't supply --rc flag when using rcd")}// Start the rc@@ -50,10 +50,10 @@ See the [rc documentation](/rc/) for more info on the rc flags.s, err := rcserver.Start(context.Background(), &rc.Opt)if err != nil {- log.Fatalf("Failed to start remote control: %v", err)+ fs.Fatalf(nil, "Failed to start remote control: %v", err)}if s == nil {- log.Fatal("rc server not configured")+ fs.Fatal(nil, "rc server not configured")}// Notify stopping on exitdiff --git a/cmd/selfupdate/selfupdate.go b/cmd/selfupdate/selfupdate.goindex 6e0b61e8d..cca72a81b 100644--- a/cmd/selfupdate/selfupdate.go+++ b/cmd/selfupdate/selfupdate.go@@ -14,7 +14,6 @@ import ("errors""fmt""io"- "log""net/http""os""os/exec"@@ -83,19 +82,19 @@ var cmdSelfUpdate = &cobra.Command{}if Opt.Package != "zip" {if Opt.Package != "deb" && Opt.Package != "rpm" {- log.Fatalf("--package should be one of zip|deb|rpm")+ fs.Fatalf(nil, "--package should be one of zip|deb|rpm")}if runtime.GOOS != "linux" {- log.Fatalf(".deb and .rpm packages are supported only on Linux")+ fs.Fatalf(nil, ".deb and .rpm packages are supported only on Linux")} else if os.Geteuid() != 0 && !Opt.Check {- log.Fatalf(".deb and .rpm must be installed by root")+ fs.Fatalf(nil, ".deb and .rpm must be installed by root")}if Opt.Output != "" && !Opt.Check {fmt.Println("Warning: --output is ignored with --package deb|rpm")}}if err := InstallUpdate(context.Background(), &Opt); err != nil {- log.Fatalf("Error: %v", err)+ fs.Fatalf(nil, "Error: %v", err)}},}diff --git a/cmd/serve/dlna/cds.go b/cmd/serve/dlna/cds.goindex 94b37bf18..2e2752c73 100644--- a/cmd/serve/dlna/cds.go+++ b/cmd/serve/dlna/cds.go@@ -5,7 +5,6 @@ import ("encoding/xml""errors""fmt"- "log""net/http""net/url""os"@@ -360,7 +359,7 @@ func (o *object) FilePath() string {// Returns the ObjectID for the object. This is used in various ContentDirectory actions.func (o object) ID() string {if !path.IsAbs(o.Path) {- log.Panicf("Relative object path: %s", o.Path)+ fs.Panicf(nil, "Relative object path: %s", o.Path)}if len(o.Path) == 1 {return "0"diff --git a/cmd/serve/dlna/dlna_util.go b/cmd/serve/dlna/dlna_util.goindex d54dfea5b..a63f31f5b 100644--- a/cmd/serve/dlna/dlna_util.go+++ b/cmd/serve/dlna/dlna_util.go@@ -5,7 +5,6 @@ import ("encoding/xml""fmt""io"- "log""net""net/http""net/http/httptest"@@ -31,7 +30,7 @@ func makeDefaultFriendlyName() string {func makeDeviceUUID(unique string) string {h := md5.New()if _, err := io.WriteString(h, unique); err != nil {- log.Panicf("makeDeviceUUID write failed: %s", err)+ fs.Panicf(nil, "makeDeviceUUID write failed: %s", err)}buf := h.Sum(nil)return upnp.FormatUUID(buf)@@ -41,7 +40,7 @@ func makeDeviceUUID(unique string) string {func listInterfaces() []net.Interface {ifs, err := net.Interfaces()if err != nil {- log.Printf("list network interfaces: %v", err)+ fs.Logf(nil, "list network interfaces: %v", err)return []net.Interface{}}@@ -71,7 +70,7 @@ func didlLite(chardata string) string {func mustMarshalXML(value interface{}) []byte {ret, err := xml.MarshalIndent(value, "", " ")if err != nil {- log.Panicf("mustMarshalXML failed to marshal %v: %s", value, err)+ fs.Panicf(nil, "mustMarshalXML failed to marshal %v: %s", value, err)}return ret}diff --git a/cmd/serve/http/http.go b/cmd/serve/http/http.goindex 5ffa2d0a3..9ace8e663 100644--- a/cmd/serve/http/http.go+++ b/cmd/serve/http/http.go@@ -6,7 +6,6 @@ import ("errors""fmt""io"- "log""net/http""os""path"@@ -92,7 +91,7 @@ control the stats printing.cmd.Run(false, true, command, func() error {s, err := run(context.Background(), f, Opt)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}defer systemd.Notify()()diff --git a/cmd/serve/proxy/proxy_test.go b/cmd/serve/proxy/proxy_test.goindex 1488e7406..539468d44 100644--- a/cmd/serve/proxy/proxy_test.go+++ b/cmd/serve/proxy/proxy_test.go@@ -6,11 +6,11 @@ import ("crypto/rsa""crypto/sha256""encoding/base64"- "log""strings""testing"_ "github.com/rclone/rclone/backend/local"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/configmap""github.com/rclone/rclone/fs/config/obscure""github.com/stretchr/testify/assert"@@ -149,11 +149,11 @@ func TestRun(t *testing.T) {privateKey, privateKeyErr := rsa.GenerateKey(rand.Reader, 2048)if privateKeyErr != nil {- log.Fatal("error generating test private key " + privateKeyErr.Error())+ fs.Fatal(nil, "error generating test private key "+privateKeyErr.Error())}publicKey, publicKeyError := ssh.NewPublicKey(&privateKey.PublicKey)if privateKeyErr != nil {- log.Fatal("error generating test public key " + publicKeyError.Error())+ fs.Fatal(nil, "error generating test public key "+publicKeyError.Error())}publicKeyString := base64.StdEncoding.EncodeToString(publicKey.Marshal())diff --git a/cmd/siginfo_bsd.go b/cmd/siginfo_bsd.goindex 2f5798f53..1144459d6 100644--- a/cmd/siginfo_bsd.go+++ b/cmd/siginfo_bsd.go@@ -3,11 +3,11 @@package cmdimport (- "log""os""os/signal""syscall"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/accounting")@@ -17,7 +17,7 @@ func SigInfoHandler() {signal.Notify(signals, syscall.SIGINFO)go func() {for range signals {- log.Printf("%v\n", accounting.GlobalStats())+ fs.Printf(nil, "%v\n", accounting.GlobalStats())}}()}diff --git a/cmd/test/info/base32768.go b/cmd/test/info/base32768.goindex 8f3f61343..23949a2e1 100644--- a/cmd/test/info/base32768.go+++ b/cmd/test/info/base32768.go@@ -5,7 +5,6 @@ package infoimport ("context""fmt"- "log""os""path/filepath""strings"@@ -25,7 +24,7 @@ func (r *results) checkBase32768() {n := 0dir, err := os.MkdirTemp("", "rclone-base32768-files")if err != nil {- log.Printf("Failed to make temp dir: %v", err)+ fs.Logf(nil, "Failed to make temp dir: %v", err)return}defer func() {@@ -41,7 +40,7 @@ func (r *results) checkBase32768() {fileName := filepath.Join(dir, fmt.Sprintf("%04d-%s.txt", n, out.String()))err = os.WriteFile(fileName, []byte(fileName), 0666)if err != nil {- log.Printf("write %q failed: %v", fileName, err)+ fs.Logf(nil, "write %q failed: %v", fileName, err)return}n++@@ -50,7 +49,7 @@ func (r *results) checkBase32768() {// Make a local fsfLocal, err := fs.NewFs(ctx, dir)if err != nil {- log.Printf("Failed to make local fs: %v", err)+ fs.Logf(nil, "Failed to make local fs: %v", err)return}@@ -61,14 +60,14 @@ func (r *results) checkBase32768() {s = fspath.JoinRootPath(s, testDir)fRemote, err := fs.NewFs(ctx, s)if err != nil {- log.Printf("Failed to make remote fs: %v", err)+ fs.Logf(nil, "Failed to make remote fs: %v", err)return}defer func() {err := operations.Purge(ctx, r.f, testDir)if err != nil {- log.Printf("Failed to purge test directory: %v", err)+ fs.Logf(nil, "Failed to purge test directory: %v", err)return}}()@@ -76,7 +75,7 @@ func (r *results) checkBase32768() {// Sync local to remoteerr = sync.Sync(ctx, fRemote, fLocal, false)if err != nil {- log.Printf("Failed to sync remote fs: %v", err)+ fs.Logf(nil, "Failed to sync remote fs: %v", err)return}@@ -86,7 +85,7 @@ func (r *results) checkBase32768() {Fsrc: fLocal,})if err != nil {- log.Printf("Failed to check remote fs: %v", err)+ fs.Logf(nil, "Failed to check remote fs: %v", err)return}diff --git a/cmd/test/info/info.go b/cmd/test/info/info.goindex c2ac0977d..83bcdfee8 100644--- a/cmd/test/info/info.go+++ b/cmd/test/info/info.go@@ -10,7 +10,6 @@ import ("encoding/json""fmt""io"- "log""os""path""regexp"@@ -77,7 +76,7 @@ code for each one.Run: func(command *cobra.Command, args []string) {cmd.CheckArgs(1, 1e6, command, args)if !checkNormalization && !checkControl && !checkLength && !checkStreaming && !checkBase32768 && !all {- log.Fatalf("no tests selected - select a test or use --all")+ fs.Fatalf(nil, "no tests selected - select a test or use --all")}if all {checkNormalization = true@@ -93,7 +92,7 @@ code for each one.fs.Infof(f, "Created temporary directory for test files: %s", tempDirPath)err := f.Mkdir(context.Background(), "")if err != nil {- log.Fatalf("couldn't create temporary directory: %v", err)+ fs.Fatalf(nil, "couldn't create temporary directory: %v", err)}cmd.Run(false, false, command, func() error {diff --git a/cmd/test/info/internal/build_csv/main.go b/cmd/test/info/internal/build_csv/main.goindex fbabe5b85..fa4b15b53 100644--- a/cmd/test/info/internal/build_csv/main.go+++ b/cmd/test/info/internal/build_csv/main.go@@ -7,12 +7,12 @@ import ("flag""fmt""io"- "log""os""sort""strconv""github.com/rclone/rclone/cmd/test/info/internal"+ "github.com/rclone/rclone/fs")func main() {@@ -24,21 +24,21 @@ func main() {for _, fn := range args {f, err := os.Open(fn)if err != nil {- log.Fatalf("Unable to open %q: %s", fn, err)+ fs.Fatalf(nil, "Unable to open %q: %s", fn, err)}var remote internal.InfoReportdec := json.NewDecoder(f)err = dec.Decode(&remote)if err != nil {- log.Fatalf("Unable to decode %q: %s", fn, err)+ fs.Fatalf(nil, "Unable to decode %q: %s", fn, err)}if remote.ControlCharacters == nil {- log.Printf("Skipping remote %s: no ControlCharacters", remote.Remote)+ fs.Logf(nil, "Skipping remote %s: no ControlCharacters", remote.Remote)} else {remotes = append(remotes, remote)}if err := f.Close(); err != nil {- log.Fatalf("Closing %q failed: %s", fn, err)+ fs.Fatalf(nil, "Closing %q failed: %s", fn, err)}}@@ -117,11 +117,11 @@ func main() {} else {f, err := os.Create(*fOut)if err != nil {- log.Fatalf("Unable to create %q: %s", *fOut, err)+ fs.Fatalf(nil, "Unable to create %q: %s", *fOut, err)}defer func() {if err := f.Close(); err != nil {- log.Fatalln("Error writing csv:", err)+ fs.Fatal(nil, fmt.Sprint("Error writing csv:", err))}}()writer = f@@ -130,9 +130,9 @@ func main() {w := csv.NewWriter(writer)err := w.WriteAll(records)if err != nil {- log.Fatalln("Error writing csv:", err)+ fs.Fatal(nil, fmt.Sprint("Error writing csv:", err))} else if err := w.Error(); err != nil {- log.Fatalln("Error writing csv:", err)+ fs.Fatal(nil, fmt.Sprint("Error writing csv:", err))}}diff --git a/cmd/test/makefiles/makefiles.go b/cmd/test/makefiles/makefiles.goindex f48778cb0..3027d78ae 100644--- a/cmd/test/makefiles/makefiles.go+++ b/cmd/test/makefiles/makefiles.go@@ -4,7 +4,6 @@ package makefilesimport ("io"- "log""math""math/rand""os"@@ -117,7 +116,7 @@ var makefileCmd = &cobra.Command{var size fs.SizeSuffixerr := size.Set(args[0])if err != nil {- log.Fatalf("Failed to parse size %q: %v", args[0], err)+ fs.Fatalf(nil, "Failed to parse size %q: %v", args[0], err)}start := time.Now()fs.Logf(nil, "Creating %d files of size %v.", len(args[1:]), size)@@ -148,7 +147,7 @@ func commonInit() {}randSource = rand.New(rand.NewSource(seed))if bool2int(zero)+bool2int(sparse)+bool2int(ascii)+bool2int(pattern)+bool2int(chargen) > 1 {- log.Fatal("Can only supply one of --zero, --sparse, --ascii, --pattern or --chargen")+ fs.Fatal(nil, "Can only supply one of --zero, --sparse, --ascii, --pattern or --chargen")}switch {case zero, sparse:@@ -276,12 +275,12 @@ func (d *dir) list(path string, output []string) []string {func writeFile(dir, name string, size int64) {err := file.MkdirAll(dir, 0777)if err != nil {- log.Fatalf("Failed to make directory %q: %v", dir, err)+ fs.Fatalf(nil, "Failed to make directory %q: %v", dir, err)}path := filepath.Join(dir, name)fd, err := os.Create(path)if err != nil {- log.Fatalf("Failed to open file %q: %v", path, err)+ fs.Fatalf(nil, "Failed to open file %q: %v", path, err)}if sparse {err = fd.Truncate(size)@@ -289,11 +288,11 @@ func writeFile(dir, name string, size int64) {_, err = io.CopyN(fd, source, size)}if err != nil {- log.Fatalf("Failed to write %v bytes to file %q: %v", size, path, err)+ fs.Fatalf(nil, "Failed to write %v bytes to file %q: %v", size, path, err)}err = fd.Close()if err != nil {- log.Fatalf("Failed to close file %q: %v", path, err)+ fs.Fatalf(nil, "Failed to close file %q: %v", path, err)}fs.Infof(path, "Written file size %v", fs.SizeSuffix(size))}diff --git a/cmd/touch/touch.go b/cmd/touch/touch.goindex 4290c47bd..913d052a8 100644--- a/cmd/touch/touch.go+++ b/cmd/touch/touch.go@@ -6,7 +6,6 @@ import ("context""errors""fmt"- "log""time""github.com/rclone/rclone/cmd"@@ -86,7 +85,7 @@ then add the ` + "`--localtime`" + ` flag.func newFsDst(args []string) (f fs.Fs, remote string) {root, remote, err := fspath.Split(args[0])if err != nil {- log.Fatalf("Parsing %q failed: %v", args[0], err)+ fs.Fatalf(nil, "Parsing %q failed: %v", args[0], err)}if root == "" {root = "."diff --git a/cmdtest/cmdtest_test.go b/cmdtest/cmdtest_test.goindex 659838959..c29167342 100644--- a/cmdtest/cmdtest_test.go+++ b/cmdtest/cmdtest_test.go@@ -6,13 +6,13 @@package cmdtestimport (- "log""os""os/exec""path/filepath""strings""testing"+ "github.com/rclone/rclone/fs""github.com/stretchr/testify/assert""github.com/stretchr/testify/require")@@ -26,14 +26,14 @@ func TestMain(m *testing.M) {// started by Go test => execute testserr := os.Setenv(rcloneTestMain, "true")if err != nil {- log.Fatalf("Unable to set %s: %s", rcloneTestMain, err.Error())+ fs.Fatalf(nil, "Unable to set %s: %s", rcloneTestMain, err.Error())}os.Exit(m.Run())} else {// started by func rcloneExecMain => call rclone main in cmdtest.goerr := os.Unsetenv(rcloneTestMain)if err != nil {- log.Fatalf("Unable to unset %s: %s", rcloneTestMain, err.Error())+ fs.Fatalf(nil, "Unable to unset %s: %s", rcloneTestMain, err.Error())}main()}@@ -47,7 +47,7 @@ const rcloneTestMain = "RCLONE_TEST_MAIN"func rcloneExecMain(env string, args ...string) (string, error) {_, found := os.LookupEnv(rcloneTestMain)if !found {- log.Fatalf("Unexpected execution path: %s is missing.", rcloneTestMain)+ fs.Fatalf(nil, "Unexpected execution path: %s is missing.", rcloneTestMain)}// make a call to self to execute rclone main in a predefined environment (enters TestMain above)command := exec.Command(os.Args[0], args...)diff --git a/fs/config/config.go b/fs/config/config.goindex be0a2a914..0e078e131 100644--- a/fs/config/config.go+++ b/fs/config/config.go@@ -6,7 +6,6 @@ import ("encoding/json""errors""fmt"- "log"mathrand "math/rand""os""path/filepath"@@ -372,7 +371,7 @@ func LoadedData() Storage {}dataLoaded = true} else {- log.Fatalf("Failed to load config file %q: %v", configPath, err)+ fs.Fatalf(nil, "Failed to load config file %q: %v", configPath, err)}}return datadiff --git a/fs/config/config_read_password.go b/fs/config/config_read_password.goindex 8f3c79933..688126fb1 100644--- a/fs/config/config_read_password.go+++ b/fs/config/config_read_password.go@@ -7,9 +7,9 @@ package configimport ("fmt"- "log""os"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/lib/terminal")@@ -22,7 +22,7 @@ func ReadPassword() string {line, err := terminal.ReadPassword(stdin)_, _ = fmt.Fprintln(os.Stderr)if err != nil {- log.Fatalf("Failed to read password: %v", err)+ fs.Fatalf(nil, "Failed to read password: %v", err)}return string(line)}diff --git a/fs/config/configflags/configflags.go b/fs/config/configflags/configflags.goindex 483e41a67..ab8f10286 100644--- a/fs/config/configflags/configflags.go+++ b/fs/config/configflags/configflags.go@@ -5,7 +5,6 @@ package configflags// Options set by command line flagsimport ("context"- "log""net""os""strconv"@@ -68,7 +67,7 @@ func ParseHeaders(headers []string) []*fs.HTTPOption {for _, header := range headers {parts := strings.SplitN(header, ":", 2)if len(parts) == 1 {- log.Fatalf("Failed to parse '%s' as an HTTP header. Expecting a string like: 'Content-Encoding: gzip'", header)+ fs.Fatalf(nil, "Failed to parse '%s' as an HTTP header. Expecting a string like: 'Content-Encoding: gzip'", header)}option := &fs.HTTPOption{Key: strings.TrimSpace(parts[0]),@@ -101,7 +100,7 @@ func SetFlags(ci *fs.ConfigInfo) {// Process -q flagif quiet {if verbose > 0 {- log.Fatalf("Can't set -v and -q")+ fs.Fatalf(nil, "Can't set -v and -q")}ci.LogLevel = fs.LogLevelError}@@ -110,10 +109,10 @@ func SetFlags(ci *fs.ConfigInfo) {logLevelFlag := pflag.Lookup("log-level")if logLevelFlag != nil && logLevelFlag.Changed {if verbose > 0 {- log.Fatalf("Can't set -v and --log-level")+ fs.Fatalf(nil, "Can't set -v and --log-level")}if quiet {- log.Fatalf("Can't set -q and --log-level")+ fs.Fatalf(nil, "Can't set -q and --log-level")}}@@ -121,7 +120,7 @@ func SetFlags(ci *fs.ConfigInfo) {switch {case deleteBefore && (deleteDuring || deleteAfter),deleteDuring && deleteAfter:- log.Fatalf(`Only one of --delete-before, --delete-during or --delete-after can be used.`)+ fs.Fatalf(nil, `Only one of --delete-before, --delete-during or --delete-after can be used.`)case deleteBefore:ci.DeleteMode = fs.DeleteModeBeforecase deleteDuring:@@ -136,10 +135,10 @@ func SetFlags(ci *fs.ConfigInfo) {if bindAddr != "" {addrs, err := net.LookupIP(bindAddr)if err != nil {- log.Fatalf("--bind: Failed to parse %q as IP address: %v", bindAddr, err)+ fs.Fatalf(nil, "--bind: Failed to parse %q as IP address: %v", bindAddr, err)}if len(addrs) != 1 {- log.Fatalf("--bind: Expecting 1 IP address for %q but got %d", bindAddr, len(addrs))+ fs.Fatalf(nil, "--bind: Expecting 1 IP address for %q but got %d", bindAddr, len(addrs))}ci.BindAddr = addrs[0]}@@ -147,7 +146,7 @@ func SetFlags(ci *fs.ConfigInfo) {// Process --disableif disableFeatures != "" {if disableFeatures == "help" {- log.Fatalf("Possible backend features are: %s\n", strings.Join(new(fs.Features).List(), ", "))+ fs.Fatalf(nil, "Possible backend features are: %s\n", strings.Join(new(fs.Features).List(), ", "))}ci.DisableFeatures = strings.Split(disableFeatures, ",")}@@ -169,7 +168,7 @@ func SetFlags(ci *fs.ConfigInfo) {for _, kv := range metadataSet {equal := strings.IndexRune(kv, '=')if equal < 0 {- log.Fatalf("Failed to parse '%s' as metadata key=value.", kv)+ fs.Fatalf(nil, "Failed to parse '%s' as metadata key=value.", kv)}ci.MetadataSet[strings.ToLower(kv[:equal])] = kv[equal+1:]}@@ -181,23 +180,23 @@ func SetFlags(ci *fs.ConfigInfo) {if value, ok := parseDSCP(dscp); ok {ci.TrafficClass = value << 2} else {- log.Fatalf("--dscp: Invalid DSCP name: %v", dscp)+ fs.Fatalf(nil, "--dscp: Invalid DSCP name: %v", dscp)}}// Process --config pathif err := config.SetConfigPath(configPath); err != nil {- log.Fatalf("--config: Failed to set %q as config path: %v", configPath, err)+ fs.Fatalf(nil, "--config: Failed to set %q as config path: %v", configPath, err)}// Process --cache-dir pathif err := config.SetCacheDir(cacheDir); err != nil {- log.Fatalf("--cache-dir: Failed to set %q as cache dir: %v", cacheDir, err)+ fs.Fatalf(nil, "--cache-dir: Failed to set %q as cache dir: %v", cacheDir, err)}// Process --temp-dir pathif err := config.SetTempDir(tempDir); err != nil {- log.Fatalf("--temp-dir: Failed to set %q as temp dir: %v", tempDir, err)+ fs.Fatalf(nil, "--temp-dir: Failed to set %q as temp dir: %v", tempDir, err)}// Process --multi-thread-streams - set whether multi-thread-streams was set@@ -206,7 +205,7 @@ func SetFlags(ci *fs.ConfigInfo) {// Reload any changesif err := ci.Reload(context.Background()); err != nil {- log.Fatalf("Failed to reload config changes: %v", err)+ fs.Fatalf(nil, "Failed to reload config changes: %v", err)}}diff --git a/fs/config/flags/flags.go b/fs/config/flags/flags.goindex 6389026c8..ebbd55f2a 100644--- a/fs/config/flags/flags.go+++ b/fs/config/flags/flags.go@@ -3,7 +3,6 @@package flagsimport (- "log""os""regexp""strings"@@ -74,7 +73,7 @@ func (gs *Groups) Include(groupsString string) *Groups {for _, groupName := range strings.Split(groupsString, ",") {_, ok := All.ByName[groupName]if !ok {- log.Fatalf("Couldn't find group %q in command annotation", groupName)+ fs.Fatalf(nil, "Couldn't find group %q in command annotation", groupName)}want[groupName] = true}@@ -138,7 +137,7 @@ func installFlag(flags *pflag.FlagSet, name string, groupsString string) {// Find flagflag := flags.Lookup(name)if flag == nil {- log.Fatalf("Couldn't find flag --%q", name)+ fs.Fatalf(nil, "Couldn't find flag --%q", name)}// Read default from environment if possible@@ -146,7 +145,7 @@ func installFlag(flags *pflag.FlagSet, name string, groupsString string) {if envValue, envFound := os.LookupEnv(envKey); envFound {err := flags.Set(name, envValue)if err != nil {- log.Fatalf("Invalid value when setting --%s from environment variable %s=%q: %v", name, envKey, envValue, err)+ fs.Fatalf(nil, "Invalid value when setting --%s from environment variable %s=%q: %v", name, envKey, envValue, err)}fs.Debugf(nil, "Setting --%s %q from environment variable %s=%q", name, flag.Value, envKey, envValue)flag.DefValue = envValue@@ -160,7 +159,7 @@ func installFlag(flags *pflag.FlagSet, name string, groupsString string) {}group, ok := All.ByName[groupName]if !ok {- log.Fatalf("Couldn't find group %q for flag --%s", groupName, name)+ fs.Fatalf(nil, "Couldn't find group %q for flag --%s", groupName, name)}group.Add(flag)}diff --git a/fs/config/obscure/obscure.go b/fs/config/obscure/obscure.goindex 68aa9cc5f..713e4d248 100644--- a/fs/config/obscure/obscure.go+++ b/fs/config/obscure/obscure.go@@ -9,8 +9,9 @@ import ("errors""fmt""io"- "log""math"++ "github.com/rclone/rclone/fs")// crypt internals@@ -66,7 +67,7 @@ func Obscure(x string) (string, error) {func MustObscure(x string) string {out, err := Obscure(x)if err != nil {- log.Fatalf("Obscure failed: %v", err)+ fs.Fatalf(nil, "Obscure failed: %v", err)}return out}@@ -92,7 +93,7 @@ func Reveal(x string) (string, error) {func MustReveal(x string) string {out, err := Reveal(x)if err != nil {- log.Fatalf("Reveal failed: %v", err)+ fs.Fatalf(nil, "Reveal failed: %v", err)}return out}diff --git a/fs/config/ui.go b/fs/config/ui.goindex b08e9481c..fcee469b1 100644--- a/fs/config/ui.go+++ b/fs/config/ui.go@@ -7,7 +7,6 @@ import ("context""errors""fmt"- "log""os""sort""strconv"@@ -29,7 +28,7 @@ var ReadLine = func() string {buf := bufio.NewReader(os.Stdin)line, err := buf.ReadString('\n')if err != nil {- log.Fatalf("Failed to read line: %v", err)+ fs.Fatalf(nil, "Failed to read line: %v", err)}return strings.TrimSpace(line)}@@ -233,7 +232,7 @@ func ChoosePassword(defaultValue string, required bool) string {bits := ChooseNumber("Bits", 64, 1024)password, err = Password(bits)if err != nil {- log.Fatalf("Failed to make password: %v", err)+ fs.Fatalf(nil, "Failed to make password: %v", err)}fmt.Printf("Your password is: %s\n", password)fmt.Printf("Use this password? Please note that an obscured version of this \npassword (and not the " +@@ -297,7 +296,7 @@ func ChooseRemote() string {func mustFindByName(name string) *fs.RegInfo {fsType := GetValue(name, "type")if fsType == "" {- log.Fatalf("Couldn't find type of fs for %q", name)+ fs.Fatalf(nil, "Couldn't find type of fs for %q", name)}return fs.MustFind(fsType)}@@ -654,7 +653,7 @@ func ShowConfigLocation() {func ShowConfig() {str, err := LoadedData().Serialize()if err != nil {- log.Fatalf("Failed to serialize config: %v", err)+ fs.Fatalf(nil, "Failed to serialize config: %v", err)}if str == "" {str = "; empty config\n"diff --git a/fs/filter/filter.go b/fs/filter/filter.goindex 61c1a2556..ebaa68119 100644--- a/fs/filter/filter.go+++ b/fs/filter/filter.go@@ -5,7 +5,6 @@ import ("context""errors""fmt"- "log""path""strings""time"@@ -190,7 +189,7 @@ func NewFilter(opt *Options) (f *Filter, err error) {if f.Opt.MaxAge.IsSet() {f.ModTimeFrom = time.Now().Add(-time.Duration(f.Opt.MaxAge))if !f.ModTimeTo.IsZero() && f.ModTimeTo.Before(f.ModTimeFrom) {- log.Fatalf("filter: --min-age %q can't be larger than --max-age %q", opt.MinAge, opt.MaxAge)+ fs.Fatalf(nil, "filter: --min-age %q can't be larger than --max-age %q", opt.MinAge, opt.MaxAge)}fs.Debugf(nil, "--max-age %v to %v", f.Opt.MaxAge, f.ModTimeFrom)}diff --git a/fs/fshttp/http.go b/fs/fshttp/http.goindex 5a3fea073..9d405df1d 100644--- a/fs/fshttp/http.go+++ b/fs/fshttp/http.go@@ -6,7 +6,6 @@ import ("context""crypto/tls""crypto/x509"- "log""net""net/http""net/http/cookiejar"@@ -71,17 +70,17 @@ func NewTransportCustom(ctx context.Context, customize func(*http.Transport)) ht// Load client certsif ci.ClientCert != "" || ci.ClientKey != "" {if ci.ClientCert == "" || ci.ClientKey == "" {- log.Fatalf("Both --client-cert and --client-key must be set")+ fs.Fatalf(nil, "Both --client-cert and --client-key must be set")}cert, err := tls.LoadX509KeyPair(ci.ClientCert, ci.ClientKey)if err != nil {- log.Fatalf("Failed to load --client-cert/--client-key pair: %v", err)+ fs.Fatalf(nil, "Failed to load --client-cert/--client-key pair: %v", err)}if cert.Leaf == nil {// Leaf is always the first certificatecert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])if err != nil {- log.Fatalf("Failed to parse the certificate")+ fs.Fatalf(nil, "Failed to parse the certificate")}}t.TLSClientConfig.Certificates = []tls.Certificate{cert}@@ -95,11 +94,11 @@ func NewTransportCustom(ctx context.Context, customize func(*http.Transport)) htfor _, cert := range ci.CaCert {caCert, err := os.ReadFile(cert)if err != nil {- log.Fatalf("Failed to read --ca-cert file %q : %v", cert, err)+ fs.Fatalf(nil, "Failed to read --ca-cert file %q : %v", cert, err)}ok := caCertPool.AppendCertsFromPEM(caCert)if !ok {- log.Fatalf("Failed to add certificates from --ca-cert file %q", cert)+ fs.Fatalf(nil, "Failed to add certificates from --ca-cert file %q", cert)}}t.TLSClientConfig.RootCAs = caCertPool@@ -303,7 +302,7 @@ func (t *Transport) reloadCertificates() {cert, err := tls.LoadX509KeyPair(t.clientCert, t.clientKey)if err != nil {- log.Fatalf("Failed to load --client-cert/--client-key pair: %v", err)+ fs.Fatalf(nil, "Failed to load --client-cert/--client-key pair: %v", err)}// Check if we need to parse the certificate again, we need it// for checking the expiration date@@ -311,7 +310,7 @@ func (t *Transport) reloadCertificates() {// Leaf is always the first certificatecert.Leaf, err = x509.ParseCertificate(cert.Certificate[0])if err != nil {- log.Fatalf("Failed to parse the certificate")+ fs.Fatalf(nil, "Failed to parse the certificate")}}t.TLSClientConfig.Certificates = []tls.Certificate{cert}diff --git a/fs/hash/hash_test.go b/fs/hash/hash_test.goindex 403a0d6e7..9215e9b9e 100644--- a/fs/hash/hash_test.go+++ b/fs/hash/hash_test.go@@ -2,10 +2,11 @@ package hash_testimport ("bytes"+ "fmt""io"- "log""testing"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/hash""github.com/spf13/pflag""github.com/stretchr/testify/assert"@@ -24,7 +25,7 @@ func TestHashSet(t *testing.T) {assert.Len(t, a, 0)h = h.Add(hash.MD5)- log.Println(h)+ fs.Log(nil, fmt.Sprint(h))assert.Equal(t, 1, h.Count())assert.Equal(t, hash.MD5, h.GetOne())a = h.Array()diff --git a/fs/log/log.go b/fs/log/log.goindex 0877f5d72..1400d4e7e 100644--- a/fs/log/log.go+++ b/fs/log/log.go@@ -144,7 +144,7 @@ func InitLogging() {if Opt.File != "" {f, err := os.OpenFile(Opt.File, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0640)if err != nil {- log.Fatalf("Failed to open log file: %v", err)+ fs.Fatalf(nil, "Failed to open log file: %v", err)}_, err = f.Seek(0, io.SeekEnd)if err != nil {@@ -158,7 +158,7 @@ func InitLogging() {// Syslog outputif Opt.UseSyslog {if Opt.File != "" {- log.Fatalf("Can't use --syslog and --log-file together")+ fs.Fatalf(nil, "Can't use --syslog and --log-file together")}startSysLog()}diff --git a/fs/log/redirect_stderr_unix.go b/fs/log/redirect_stderr_unix.goindex f37a89204..dd7aa4d6f 100644--- a/fs/log/redirect_stderr_unix.go+++ b/fs/log/redirect_stderr_unix.go@@ -5,9 +5,9 @@package logimport (- "log""os"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config""golang.org/x/sys/unix")@@ -16,11 +16,11 @@ import (func redirectStderr(f *os.File) {passPromptFd, err := unix.Dup(int(os.Stderr.Fd()))if err != nil {- log.Fatalf("Failed to duplicate stderr: %v", err)+ fs.Fatalf(nil, "Failed to duplicate stderr: %v", err)}config.PasswordPromptOutput = os.NewFile(uintptr(passPromptFd), "passPrompt")err = unix.Dup2(int(f.Fd()), int(os.Stderr.Fd()))if err != nil {- log.Fatalf("Failed to redirect stderr to file: %v", err)+ fs.Fatalf(nil, "Failed to redirect stderr to file: %v", err)}}diff --git a/fs/log/redirect_stderr_windows.go b/fs/log/redirect_stderr_windows.goindex f20ede7b0..6d6c6abb8 100644--- a/fs/log/redirect_stderr_windows.go+++ b/fs/log/redirect_stderr_windows.go@@ -9,9 +9,10 @@package logimport (- "log""os""syscall"++ "github.com/rclone/rclone/fs")var (@@ -34,6 +35,6 @@ func setStdHandle(stdhandle int32, handle syscall.Handle) error {func redirectStderr(f *os.File) {err := setStdHandle(syscall.STD_ERROR_HANDLE, syscall.Handle(f.Fd()))if err != nil {- log.Fatalf("Failed to redirect stderr to file: %v", err)+ fs.Fatalf(nil, "Failed to redirect stderr to file: %v", err)}}diff --git a/fs/log/syslog.go b/fs/log/syslog.goindex 58b82ac9f..fd98f9fb6 100644--- a/fs/log/syslog.go+++ b/fs/log/syslog.go@@ -5,12 +5,13 @@package logimport (- "log""runtime"++ "github.com/rclone/rclone/fs")// Starts syslog if configured, returns true if it was startedfunc startSysLog() bool {- log.Fatalf("--syslog not supported on %s platform", runtime.GOOS)+ fs.Fatalf(nil, "--syslog not supported on %s platform", runtime.GOOS)return false}diff --git a/fs/log/syslog_unix.go b/fs/log/syslog_unix.goindex baa6c613a..4fbbd2099 100644--- a/fs/log/syslog_unix.go+++ b/fs/log/syslog_unix.go@@ -42,12 +42,12 @@ var (func startSysLog() bool {facility, ok := syslogFacilityMap[Opt.SyslogFacility]if !ok {- log.Fatalf("Unknown syslog facility %q - man syslog for list", Opt.SyslogFacility)+ fs.Fatalf(nil, "Unknown syslog facility %q - man syslog for list", Opt.SyslogFacility)}Me := path.Base(os.Args[0])w, err := syslog.New(syslog.LOG_NOTICE|facility, Me)if err != nil {- log.Fatalf("Failed to start syslog: %v", err)+ fs.Fatalf(nil, "Failed to start syslog: %v", err)}log.SetFlags(0)log.SetOutput(w)diff --git a/fs/log/systemd.go b/fs/log/systemd.goindex 2caf675da..84e9a3bd3 100644--- a/fs/log/systemd.go+++ b/fs/log/systemd.go@@ -5,13 +5,14 @@package logimport (- "log""runtime"++ "github.com/rclone/rclone/fs")// Enables systemd logs if configured or if auto-detectedfunc startSystemdLog() bool {- log.Fatalf("--log-systemd not supported on %s platform", runtime.GOOS)+ fs.Fatalf(nil, "--log-systemd not supported on %s platform", runtime.GOOS)return false}diff --git a/fs/mount_helper.go b/fs/mount_helper.goindex 035b75284..ef81777fc 100644--- a/fs/mount_helper.go+++ b/fs/mount_helper.go@@ -3,7 +3,6 @@ package fsimport ("errors""fmt"- "log""os""path/filepath""runtime"@@ -16,7 +15,7 @@ func init() {if args, err := convertMountHelperArgs(os.Args); err == nil {os.Args = args} else {- log.Fatalf("Failed to parse command line: %v", err)+ Fatalf(nil, "Failed to parse command line: %v", err)}}}diff --git a/fs/operations/dedupe.go b/fs/operations/dedupe.goindex e5e356c72..3e0f72cd5 100644--- a/fs/operations/dedupe.go+++ b/fs/operations/dedupe.go@@ -5,7 +5,6 @@ package operationsimport ("context""fmt"- "log""path""sort""strings"@@ -21,7 +20,7 @@ import (func dedupeRename(ctx context.Context, f fs.Fs, remote string, objs []fs.Object) {doMove := f.Features().Moveif doMove == nil {- log.Fatalf("Fs %v doesn't support Move", f)+ fs.Fatalf(nil, "Fs %v doesn't support Move", f)}ext := path.Ext(remote)base := remote[:len(remote)-len(ext)]diff --git a/fs/rc/rcserver/rcserver.go b/fs/rc/rcserver/rcserver.goindex 6c91931c7..8cc666f3c 100644--- a/fs/rc/rcserver/rcserver.go+++ b/fs/rc/rcserver/rcserver.go@@ -7,7 +7,6 @@ import ("encoding/json""flag""fmt"- "log""mime""net/http""net/url"@@ -86,7 +85,7 @@ func newServer(ctx context.Context, opt *rc.Options, mux *http.ServeMux) (*Serveif opt.Auth.BasicPass == "" && opt.Auth.HtPasswd == "" {randomPass, err := random.Password(128)if err != nil {- log.Fatalf("Failed to make password: %v", err)+ fs.Fatalf(nil, "Failed to make password: %v", err)}opt.Auth.BasicPass = randomPassfs.Infof(nil, "No password specified. Using random password: %s \n", randomPass)diff --git a/fs/registry.go b/fs/registry.goindex ad9191d43..937d5c1f0 100644--- a/fs/registry.go+++ b/fs/registry.go@@ -6,7 +6,6 @@ import ("context""encoding/json""fmt"- "log""reflect""regexp""sort"@@ -408,7 +407,7 @@ func Find(name string) (*RegInfo, error) {func MustFind(name string) *RegInfo {fs, err := Find(name)if err != nil {- log.Fatalf("Failed to find remote: %v", err)+ Fatalf(nil, "Failed to find remote: %v", err)}return fs}@@ -434,7 +433,7 @@ func RegisterGlobalOptions(oi OptionsInfo) {if oi.Opt != nil && oi.Options != nil {err := oi.Check()if err != nil {- log.Fatalf("%v", err)+ Fatalf(nil, "%v", err)}}// Load the default values into the options.@@ -446,7 +445,7 @@ func RegisterGlobalOptions(oi OptionsInfo) {// again when the flags are ready.err := oi.load()if err != nil {- log.Fatalf("Failed to load %q default values: %v", oi.Name, err)+ Fatalf(nil, "Failed to load %q default values: %v", oi.Name, err)}}diff --git a/fstest/fstest.go b/fstest/fstest.goindex 032a50853..69a05d76a 100644--- a/fstest/fstest.go+++ b/fstest/fstest.go@@ -10,7 +10,6 @@ import ("flag""fmt""io"- "log""os""path""path/filepath"@@ -99,7 +98,7 @@ func NewItem(Path, Content string, modTime time.Time) Item {buf := bytes.NewBufferString(Content)_, err := io.Copy(hash, buf)if err != nil {- log.Fatalf("Failed to create item: %v", err)+ fs.Fatalf(nil, "Failed to create item: %v", err)}i.Hashes = hash.Sums()return i@@ -398,7 +397,7 @@ func CompareItems(t *testing.T, entries fs.DirEntries, items []Item, expectedDirfunc Time(timeString string) time.Time {t, err := time.Parse(time.RFC3339Nano, timeString)if err != nil {- log.Fatalf("Failed to parse time %q: %v", timeString, err)+ fs.Fatalf(nil, "Failed to parse time %q: %v", timeString, err)}return t}@@ -433,7 +432,7 @@ func RandomRemoteName(remoteName string) (string, string, error) {}leafName = "rclone-test-" + random.String(12)if !MatchTestRemote.MatchString(leafName) {- log.Fatalf("%q didn't match the test remote name regexp", leafName)+ fs.Fatalf(nil, "%q didn't match the test remote name regexp", leafName)}remoteName += leafName}@@ -467,7 +466,7 @@ func RandomRemote() (fs.Fs, string, func(), error) {if parentRemote != nil {Purge(parentRemote)if err != nil {- log.Printf("Failed to purge %v: %v", parentRemote, err)+ fs.Logf(nil, "Failed to purge %v: %v", parentRemote, err)}}}@@ -499,7 +498,7 @@ func Purge(f fs.Fs) {fs.Debugf(f, "Purge object %q", obj.Remote())err = obj.Remove(ctx)if err != nil {- log.Printf("purge failed to remove %q: %v", obj.Remote(), err)+ fs.Logf(nil, "purge failed to remove %q: %v", obj.Remote(), err)}})entries.ForDir(func(dir fs.Directory) {@@ -513,12 +512,12 @@ func Purge(f fs.Fs) {fs.Debugf(f, "Purge dir %q", dir)err := f.Rmdir(ctx, dir)if err != nil {- log.Printf("purge failed to rmdir %q: %v", dir, err)+ fs.Logf(nil, "purge failed to rmdir %q: %v", dir, err)}}}if err != nil {- log.Printf("purge failed: %v", err)+ fs.Logf(nil, "purge failed: %v", err)}}diff --git a/fstest/test_all/clean.go b/fstest/test_all/clean.goindex 788061cf3..0e386dcaf 100644--- a/fstest/test_all/clean.go+++ b/fstest/test_all/clean.go@@ -5,7 +5,6 @@ package mainimport ("context""fmt"- "log""regexp""github.com/rclone/rclone/fs"@@ -27,7 +26,7 @@ func cleanFs(ctx context.Context, remote string, cleanup bool) error {}var lastErr errorif cleanup {- log.Printf("%q - running cleanup", remote)+ fs.Logf(nil, "%q - running cleanup", remote)err = operations.CleanUp(ctx, f)if err != nil {lastErr = err@@ -43,10 +42,10 @@ func cleanFs(ctx context.Context, remote string, cleanup bool) error {fullPath := fspath.JoinRootPath(remote, dirPath)if MatchTestRemote.MatchString(dirPath) {if *dryRun {- log.Printf("Not Purging %s - -dry-run", fullPath)+ fs.Logf(nil, "Not Purging %s - -dry-run", fullPath)return nil}- log.Printf("Purging %s", fullPath)+ fs.Logf(nil, "Purging %s", fullPath)dir, err := fs.NewFs(context.Background(), fullPath)if err != nil {err = fmt.Errorf("NewFs failed: %w", err)@@ -75,11 +74,11 @@ func cleanRemotes(conf *Config) error {var lastError errorfor _, backend := range conf.Backends {remote := backend.Remote- log.Printf("%q - Cleaning", remote)+ fs.Logf(nil, "%q - Cleaning", remote)err := cleanFs(context.Background(), remote, backend.CleanUp)if err != nil {lastError = err- log.Printf("Failed to purge %q: %v", remote, err)+ fs.Logf(nil, "Failed to purge %q: %v", remote, err)}}return lastErrordiff --git a/fstest/test_all/config.go b/fstest/test_all/config.goindex 45920e25e..82eab084d 100644--- a/fstest/test_all/config.go+++ b/fstest/test_all/config.go@@ -4,7 +4,6 @@ package mainimport ("fmt"- "log""os""path"@@ -65,7 +64,7 @@ func (b *Backend) MakeRuns(t *Test) (runs []*Run) {maxSize := fs.SizeSuffix(0)if b.MaxFile != "" {if err := maxSize.Set(b.MaxFile); err != nil {- log.Printf("Invalid maxfile value %q: %v", b.MaxFile, err)+ fs.Logf(nil, "Invalid maxfile value %q: %v", b.MaxFile, err)}}fastlists := []bool{false}@@ -152,11 +151,11 @@ func (c *Config) filterBackendsByRemotes(remotes []string) {}}if !found {- log.Printf("Remote %q not found - inserting with default flags", name)+ fs.Logf(nil, "Remote %q not found - inserting with default flags", name)// Lookup which backendfsInfo, _, _, _, err := fs.ConfigFs(name)if err != nil {- log.Fatalf("couldn't find remote %q: %v", name, err)+ fs.Fatalf(nil, "couldn't find remote %q: %v", name, err)}newBackends = append(newBackends, Backend{Backend: fsInfo.FileName(), Remote: name})}diff --git a/fstest/test_all/report.go b/fstest/test_all/report.goindex 0dd4167d5..c03e226bf 100644--- a/fstest/test_all/report.go+++ b/fstest/test_all/report.go@@ -4,7 +4,6 @@ import ("encoding/json""fmt""html/template"- "log""os""os/exec""path"@@ -77,7 +76,7 @@ func NewReport() *Report {r.LogDir = path.Join(*outputDir, r.DateTime)err = file.MkdirAll(r.LogDir, 0777)if err != nil {- log.Fatalf("Failed to make log directory: %v", err)+ fs.Fatalf(nil, "Failed to make log directory: %v", err)}// Online version@@ -132,15 +131,15 @@ func (r *Report) Title() string {// LogSummary writes the summary to the log filefunc (r *Report) LogSummary() {- log.Printf("Logs in %q", r.LogDir)+ fs.Logf(nil, "Logs in %q", r.LogDir)// Summarise results- log.Printf("SUMMARY")- log.Println(r.Title())+ fs.Logf(nil, "SUMMARY")+ fs.Log(nil, r.Title())if !r.AllPassed() {for _, t := range r.Failed {- log.Printf(" * %s", toShell(t.nextCmdLine()))- log.Printf(" * Failed tests: %v", t.FailedTests)+ fs.Logf(nil, " * %s", toShell(t.nextCmdLine()))+ fs.Logf(nil, " * Failed tests: %v", t.FailedTests)}}}@@ -149,11 +148,11 @@ func (r *Report) LogSummary() {func (r *Report) LogJSON() {out, err := json.MarshalIndent(r, "", "\t")if err != nil {- log.Fatalf("Failed to marshal data for index.json: %v", err)+ fs.Fatalf(nil, "Failed to marshal data for index.json: %v", err)}err = os.WriteFile(path.Join(r.LogDir, "index.json"), out, 0666)if err != nil {- log.Fatalf("Failed to write index.json: %v", err)+ fs.Fatalf(nil, "Failed to write index.json: %v", err)}}@@ -162,17 +161,17 @@ func (r *Report) LogHTML() {r.IndexHTML = path.Join(r.LogDir, "index.html")out, err := os.Create(r.IndexHTML)if err != nil {- log.Fatalf("Failed to open index.html: %v", err)+ fs.Fatalf(nil, "Failed to open index.html: %v", err)}defer func() {err := out.Close()if err != nil {- log.Fatalf("Failed to close index.html: %v", err)+ fs.Fatalf(nil, "Failed to close index.html: %v", err)}}()err = reportTemplate.Execute(out, r)if err != nil {- log.Fatalf("Failed to execute template: %v", err)+ fs.Fatalf(nil, "Failed to execute template: %v", err)}_ = open.Start("file://" + r.IndexHTML)}@@ -282,19 +281,19 @@ func (r *Report) EmailHTML() {if *emailReport == "" || r.IndexHTML == "" {return}- log.Printf("Sending email summary to %q", *emailReport)+ fs.Logf(nil, "Sending email summary to %q", *emailReport)cmdLine := []string{"mail", "-a", "Content-Type: text/html", *emailReport, "-s", "rclone integration tests: " + r.Title()}cmd := exec.Command(cmdLine[0], cmdLine[1:]...)in, err := os.Open(r.IndexHTML)if err != nil {- log.Fatalf("Failed to open index.html: %v", err)+ fs.Fatalf(nil, "Failed to open index.html: %v", err)}cmd.Stdin = incmd.Stdout = os.Stdoutcmd.Stderr = os.Stderrerr = cmd.Run()if err != nil {- log.Fatalf("Failed to send email: %v", err)+ fs.Fatalf(nil, "Failed to send email: %v", err)}_ = in.Close()}@@ -302,14 +301,14 @@ func (r *Report) EmailHTML() {// uploadTo uploads a copy of the report online to the dir givenfunc (r *Report) uploadTo(uploadDir string) {dst := path.Join(*uploadPath, uploadDir)- log.Printf("Uploading results to %q", dst)+ fs.Logf(nil, "Uploading results to %q", dst)cmdLine := []string{"rclone", "sync", "--stats-log-level", "NOTICE", r.LogDir, dst}cmd := exec.Command(cmdLine[0], cmdLine[1:]...)cmd.Stdout = os.Stdoutcmd.Stderr = os.Stderrerr := cmd.Run()if err != nil {- log.Fatalf("Failed to upload results: %v", err)+ fs.Fatalf(nil, "Failed to upload results: %v", err)}}diff --git a/fstest/test_all/run.go b/fstest/test_all/run.goindex f156b7f18..40560d6e5 100644--- a/fstest/test_all/run.go+++ b/fstest/test_all/run.go@@ -8,7 +8,6 @@ import ("fmt""go/build""io"- "log""os""os/exec""path"@@ -94,10 +93,10 @@ func (rs Runs) Less(i, j int) bool {// dumpOutput prints the error outputfunc (r *Run) dumpOutput() {- log.Println("------------------------------------------------------------")- log.Printf("---- %q ----", r.CmdString)- log.Println(string(r.output))- log.Println("------------------------------------------------------------")+ fs.Log(nil, "------------------------------------------------------------")+ fs.Logf(nil, "---- %q ----", r.CmdString)+ fs.Log(nil, string(r.output))+ fs.Log(nil, "------------------------------------------------------------")}// trie for storing runs@@ -180,7 +179,7 @@ func (r *Run) findFailures() {}r.FailedTests = newTestsif len(r.FailedTests) == 0 && ignored > 0 {- log.Printf("%q - Found %d ignored errors only - marking as good", r.CmdString, ignored)+ fs.Logf(nil, "%q - Found %d ignored errors only - marking as good", r.CmdString, ignored)r.err = nilr.dumpOutput()return@@ -191,10 +190,10 @@ func (r *Run) findFailures() {r.RunFlag = ""}if r.passed() && len(r.FailedTests) != 0 {- log.Printf("%q - Expecting no errors but got: %v", r.CmdString, r.FailedTests)+ fs.Logf(nil, "%q - Expecting no errors but got: %v", r.CmdString, r.FailedTests)r.dumpOutput()} else if !r.passed() && len(r.FailedTests) == 0 {- log.Printf("%q - Expecting errors but got none: %v", r.CmdString, r.FailedTests)+ fs.Logf(nil, "%q - Expecting errors but got none: %v", r.CmdString, r.FailedTests)r.dumpOutput()r.FailedTests = oldFailedTests}@@ -214,23 +213,23 @@ func (r *Run) trial() {CmdLine := r.nextCmdLine()CmdString := toShell(CmdLine)msg := fmt.Sprintf("%q - Starting (try %d/%d)", CmdString, r.Try, *maxTries)- log.Println(msg)+ fs.Log(nil, msg)logName := path.Join(r.LogDir, r.TrialName)out, err := os.Create(logName)if err != nil {- log.Fatalf("Couldn't create log file: %v", err)+ fs.Fatalf(nil, "Couldn't create log file: %v", err)}defer func() {err := out.Close()if err != nil {- log.Fatalf("Failed to close log file: %v", err)+ fs.Fatalf(nil, "Failed to close log file: %v", err)}}()_, _ = fmt.Fprintln(out, msg)// Early exit if --try-runif *dryRun {- log.Printf("Not executing as --dry-run: %v", CmdLine)+ fs.Logf(nil, "Not executing as --dry-run: %v", CmdLine)_, _ = fmt.Fprintln(out, "--dry-run is set - not running")return}@@ -238,7 +237,7 @@ func (r *Run) trial() {// Start the test server if requiredfinish, err := testserver.Start(r.Remote)if err != nil {- log.Printf("%s: Failed to start test server: %v", r.Remote, err)+ fs.Logf(nil, "%s: Failed to start test server: %v", r.Remote, err)_, _ = fmt.Fprintf(out, "%s: Failed to start test server: %v\n", r.Remote, err)r.err = errreturn@@ -263,7 +262,7 @@ func (r *Run) trial() {} else {msg = fmt.Sprintf("%q - Finished ERROR in %v (try %d/%d): %v: Failed %v", CmdString, duration, r.Try, *maxTries, r.err, r.FailedTests)}- log.Println(msg)+ fs.Log(nil, msg)_, _ = fmt.Fprintln(out, msg)}@@ -304,23 +303,23 @@ func (r *Run) PackagePath() string {func (r *Run) MakeTestBinary() {binary := r.BinaryPath()binaryName := r.BinaryName()- log.Printf("%s: Making test binary %q", r.Path, binaryName)+ fs.Logf(nil, "%s: Making test binary %q", r.Path, binaryName)CmdLine := []string{"go", "test", "-c"}if *race {CmdLine = append(CmdLine, "-race")}if *dryRun {- log.Printf("Not executing: %v", CmdLine)+ fs.Logf(nil, "Not executing: %v", CmdLine)return}cmd := exec.Command(CmdLine[0], CmdLine[1:]...)cmd.Dir = r.Patherr := cmd.Run()if err != nil {- log.Fatalf("Failed to make test binary: %v", err)+ fs.Fatalf(nil, "Failed to make test binary: %v", err)}if _, err := os.Stat(binary); err != nil {- log.Fatalf("Couldn't find test binary %q", binary)+ fs.Fatalf(nil, "Couldn't find test binary %q", binary)}}@@ -332,7 +331,7 @@ func (r *Run) RemoveTestBinary() {binary := r.BinaryPath()err := os.Remove(binary) // Delete the binary when finishedif err != nil {- log.Printf("Error removing test binary %q: %v", binary, err)+ fs.Logf(nil, "Error removing test binary %q: %v", binary, err)}}@@ -428,7 +427,7 @@ func (r *Run) Run(LogDir string, result chan<- *Run) {for r.Try = 1; r.Try <= *maxTries; r.Try++ {r.TrialName = r.Name() + ".txt"r.TrialNames = append(r.TrialNames, r.TrialName)- log.Printf("Starting run with log %q", r.TrialName)+ fs.Logf(nil, "Starting run with log %q", r.TrialName)r.trial()if r.passed() || r.NoRetries {breakdiff --git a/fstest/test_all/test_all.go b/fstest/test_all/test_all.goindex 79263f0e4..f1b40c34d 100644--- a/fstest/test_all/test_all.go+++ b/fstest/test_all/test_all.go@@ -12,7 +12,7 @@ Make TesTrun have a []string of flags to try - that then makes it genericimport ("flag"- "log"+ "fmt""math/rand""os""path"@@ -21,6 +21,7 @@ import ("time"_ "github.com/rclone/rclone/backend/all" // import all fs+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/configfile""github.com/rclone/rclone/lib/pacer")@@ -68,8 +69,8 @@ func main() {flag.Parse()conf, err := NewConfig(*configFile)if err != nil {- log.Println("test_all should be run from the root of the rclone source code")- log.Fatal(err)+ fs.Log(nil, "test_all should be run from the root of the rclone source code")+ fs.Fatal(nil, fmt.Sprint(err))}configfile.Install()@@ -91,7 +92,7 @@ func main() {if *clean {err := cleanRemotes(conf)if err != nil {- log.Fatalf("Failed to clean: %v", err)+ fs.Fatalf(nil, "Failed to clean: %v", err)}return}@@ -100,7 +101,7 @@ func main() {for _, remote := range conf.Backends {names = append(names, remote.Remote)}- log.Printf("Testing remotes: %s", strings.Join(names, ", "))+ fs.Logf(nil, "Testing remotes: %s", strings.Join(names, ", "))// Runs we will do for this test in random orderruns := conf.MakeRuns()diff --git a/lib/encoder/internal/gen/main.go b/lib/encoder/internal/gen/main.goindex 5fd8c37ba..dfe556760 100644--- a/lib/encoder/internal/gen/main.go+++ b/lib/encoder/internal/gen/main.go@@ -4,12 +4,12 @@ package mainimport ("flag""fmt"- "log""math/rand""os""strconv""strings"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/lib/encoder")@@ -434,13 +434,13 @@ var testCasesDoubleEdge = []testCase{func fatal(err error, s ...interface{}) {if err != nil {- log.Fatalln(append(s, err))+ fs.Fatal(nil, fmt.Sprint(append(s, err)))}}func fatalW(_ int, err error) func(...interface{}) {if err != nil {return func(s ...interface{}) {- log.Fatalln(append(s, err))+ fs.Fatal(nil, fmt.Sprint(append(s, err)))}}return func(s ...interface{}) {}diff --git a/lib/http/auth.go b/lib/http/auth.goindex 0c1137152..219b140a8 100644--- a/lib/http/auth.go+++ b/lib/http/auth.go@@ -2,8 +2,8 @@ package httpimport ("bytes"+ "fmt""html/template"- "log""github.com/rclone/rclone/fs""github.com/rclone/rclone/fs/config/flags"@@ -42,7 +42,7 @@ Use ` + "`--{{ .Prefix }}salt`" + ` to change the password hashing salt from the`tmpl, err := template.New("auth help").Parse(help)if err != nil {- log.Fatal("Fatal error parsing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))}data := struct {@@ -53,7 +53,7 @@ Use ` + "`--{{ .Prefix }}salt`" + ` to change the password hashing salt from thebuf := &bytes.Buffer{}err = tmpl.Execute(buf, data)if err != nil {- log.Fatal("Fatal error executing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))}return buf.String()}diff --git a/lib/http/server.go b/lib/http/server.goindex ca76fcf52..e1e1501d6 100644--- a/lib/http/server.go+++ b/lib/http/server.go@@ -9,7 +9,6 @@ import ("errors""fmt""html/template"- "log""net""net/http""os"@@ -78,7 +77,7 @@ certificate authority certificate.`tmpl, err := template.New("server help").Parse(help)if err != nil {- log.Fatal("Fatal error parsing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))}data := struct {@@ -89,7 +88,7 @@ certificate authority certificate.buf := &bytes.Buffer{}err = tmpl.Execute(buf, data)if err != nil {- log.Fatal("Fatal error executing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))}return buf.String()}@@ -199,7 +198,7 @@ func (s instance) serve(wg *sync.WaitGroup) {defer wg.Done()err := s.httpServer.Serve(s.listener)if err != http.ErrServerClosed && err != nil {- log.Printf("%s: unexpected error: %s", s.listener.Addr(), err.Error())+ fs.Logf(nil, "%s: unexpected error: %s", s.listener.Addr(), err.Error())}}@@ -497,7 +496,7 @@ func (s *Server) Shutdown() error {expiry := time.Now().Add(gracefulShutdownTime)ctx, cancel := context.WithDeadline(context.Background(), expiry)if err := ii.httpServer.Shutdown(ctx); err != nil {- log.Printf("error shutting down server: %s", err)+ fs.Logf(nil, "error shutting down server: %s", err)}cancel()}diff --git a/lib/http/template.go b/lib/http/template.goindex e36e44b80..a79c06f63 100644--- a/lib/http/template.go+++ b/lib/http/template.go@@ -3,8 +3,8 @@ package httpimport ("bytes""embed"+ "fmt""html/template"- "log""os""strings""time"@@ -57,7 +57,7 @@ be used to render HTML based on specific conditions.tmpl, err := template.New("template help").Parse(help)if err != nil {- log.Fatal("Fatal error parsing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error parsing template", err))}data := struct {@@ -68,7 +68,7 @@ be used to render HTML based on specific conditions.buf := &bytes.Buffer{}err = tmpl.Execute(buf, data)if err != nil {- log.Fatal("Fatal error executing template", err)+ fs.Fatal(nil, fmt.Sprint("Fatal error executing template", err))}return buf.String()}diff --git a/lib/pool/pool.go b/lib/pool/pool.goindex cf0ed93e2..4cb4d3a71 100644--- a/lib/pool/pool.go+++ b/lib/pool/pool.go@@ -4,10 +4,10 @@ package poolimport ("fmt"- "log""sync""time"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/lib/mmap")@@ -161,7 +161,7 @@ func (bp *Pool) Get() []byte {bp.alloced++break}- log.Printf("Failed to get memory for buffer, waiting for %v: %v", waitTime, err)+ fs.Logf(nil, "Failed to get memory for buffer, waiting for %v: %v", waitTime, err)bp.mu.Unlock()time.Sleep(waitTime)bp.mu.Lock()@@ -178,7 +178,7 @@ func (bp *Pool) Get() []byte {func (bp *Pool) freeBuffer(mem []byte) {err := bp.free(mem)if err != nil {- log.Printf("Failed to free memory: %v", err)+ fs.Logf(nil, "Failed to free memory: %v", err)}bp.alloced--}diff --git a/lib/systemd/notify.go b/lib/systemd/notify.goindex 237343147..056a8628d 100644--- a/lib/systemd/notify.go+++ b/lib/systemd/notify.go@@ -2,10 +2,10 @@ package systemdimport ("fmt"- "log""sync""github.com/coreos/go-systemd/v22/daemon"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/lib/atexit")@@ -18,13 +18,13 @@ import (// It should not be called as a result of rc commands. See #7540.func Notify() func() {if _, err := daemon.SdNotify(false, daemon.SdNotifyReady); err != nil {- log.Printf("failed to notify ready to systemd: %v", err)+ fs.Logf(nil, "failed to notify ready to systemd: %v", err)}var finaliseOnce sync.Oncefinalise := func() {finaliseOnce.Do(func() {if _, err := daemon.SdNotify(false, daemon.SdNotifyStopping); err != nil {- log.Printf("failed to notify stopping to systemd: %v", err)+ fs.Logf(nil, "failed to notify stopping to systemd: %v", err)}})}diff --git a/vfs/test_vfs/test_vfs.go b/vfs/test_vfs/test_vfs.goindex 4725a7bd7..19d57a670 100644--- a/vfs/test_vfs/test_vfs.go+++ b/vfs/test_vfs/test_vfs.go@@ -7,7 +7,6 @@ import ("flag""fmt""io"- "log""math""math/rand""os"@@ -16,6 +15,7 @@ import ("sync/atomic""time"+ "github.com/rclone/rclone/fs""github.com/rclone/rclone/lib/file""github.com/rclone/rclone/lib/random")@@ -93,13 +93,13 @@ func (t *Test) randomTest() {// logf logs things - not shown unless -vfunc (t *Test) logf(format string, a ...interface{}) {if *verbose {- log.Printf(t.prefix+format, a...)+ fs.Logf(nil, t.prefix+format, a)}}// errorf logs errorsfunc (t *Test) errorf(format string, a ...interface{}) {- log.Printf(t.prefix+"ERROR: "+format, a...)+ fs.Logf(nil, t.prefix+"ERROR: "+format, a)}// list test@@ -286,7 +286,7 @@ func main() {flag.Parse()args := flag.Args()if len(args) != 1 {- log.Fatalf("%s: Syntax [opts] <directory>", os.Args[0])+ fs.Fatalf(nil, "%s: Syntax [opts] <directory>", os.Args[0])}dir := args[0]_ = file.MkdirAll(dir, 0777)diff --git a/vfs/vfstest/fs.go b/vfs/vfstest/fs.goindex 97436d38e..1c74f54dc 100644--- a/vfs/vfstest/fs.go+++ b/vfs/vfstest/fs.go@@ -8,7 +8,6 @@ import ("flag""fmt""io"- "log""os""os/exec""path"@@ -69,7 +68,7 @@ func RunTests(t *testing.T, useVFS bool, minimumRequiredCacheMode vfscommon.Cachif test.writeBack > 0 {what += fmt.Sprintf(",WriteBack=%v", test.writeBack)}- log.Printf("Starting test run with %s", what)+ fs.Logf(nil, "Starting test run with %s", what)ok := t.Run(what, func(t *testing.T) {t.Run("TestTouchAndDelete", TestTouchAndDelete)t.Run("TestRenameOpenHandle", TestRenameOpenHandle)@@ -100,7 +99,7 @@ func RunTests(t *testing.T, useVFS bool, minimumRequiredCacheMode vfscommon.Cacht.Run("TestWriteFileDup", TestWriteFileDup)t.Run("TestWriteFileAppend", TestWriteFileAppend)})- log.Printf("Finished test run with %s (ok=%v)", what, ok)+ fs.Logf(nil, "Finished test run with %s (ok=%v)", what, ok)run.Finalise()if !ok {break@@ -146,12 +145,12 @@ func newRun(useVFS bool, vfsOpt *vfscommon.Options, mountFn mountlib.MountFn) *Rvar err errorr.fremote, r.fremoteName, r.cleanRemote, err = fstest.RandomRemote()if err != nil {- log.Fatalf("Failed to open remote %q: %v", *fstest.RemoteName, err)+ fs.Fatalf(nil, "Failed to open remote %q: %v", *fstest.RemoteName, err)}err = r.fremote.Mkdir(context.Background(), "")if err != nil {- log.Fatalf("Failed to open mkdir %q: %v", *fstest.RemoteName, err)+ fs.Fatalf(nil, "Failed to open mkdir %q: %v", *fstest.RemoteName, err)}r.startMountSubProcess()@@ -176,14 +175,14 @@ func (r *Run) Finalise() {r.sendMountCommand("exit")_, err := r.cmd.Process.Wait()if err != nil {- log.Fatalf("mount sub process failed: %v", err)+ fs.Fatalf(nil, "mount sub process failed: %v", err)}}r.cleanRemote()if !r.useVFS {err := os.RemoveAll(r.mountPath)if err != nil {- log.Printf("Failed to clean mountPath %q: %v", r.mountPath, err)+ fs.Logf(nil, "Failed to clean mountPath %q: %v", r.mountPath, err)}}}diff --git a/vfs/vfstest/submount.go b/vfs/vfstest/submount.goindex d8e8fb6ff..ac6400cdf 100644--- a/vfs/vfstest/submount.go+++ b/vfs/vfstest/submount.go@@ -7,7 +7,6 @@ import ("flag""fmt""io"- "log""os""os/exec""runtime"@@ -48,7 +47,7 @@ func (r *Run) startMountSubProcess() {}r.os = realOs{}r.mountPath = findMountPath()- log.Printf("startMountSubProcess %q (%q) %q", r.fremote, r.fremoteName, r.mountPath)+ fs.Logf(nil, "startMountSubProcess %q (%q) %q", r.fremote, r.fremoteName, r.mountPath)opt := runMountOpt{MountPoint: r.mountPath,@@ -59,7 +58,7 @@ func (r *Run) startMountSubProcess() {opts, err := json.Marshal(&opt)if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}// Re-run this executable with a new option -run-mount@@ -68,32 +67,32 @@ func (r *Run) startMountSubProcess() {r.cmd.Stderr = os.Stderrr.out, err = r.cmd.StdinPipe()if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}r.in, err = r.cmd.StdoutPipe()if err != nil {- log.Fatal(err)+ fs.Fatal(nil, fmt.Sprint(err))}err = r.cmd.Start()if err != nil {- log.Fatal("startMountSubProcess failed", err)+ fs.Fatal(nil, fmt.Sprint("startMountSubProcess failed", err))}r.scanner = bufio.NewScanner(r.in)// Wait it for startup- log.Print("Waiting for mount to start")+ fs.Log(nil, "Waiting for mount to start")for r.scanner.Scan() {rx := strings.TrimSpace(r.scanner.Text())if rx == "STARTED" {break}- log.Printf("..Mount said: %s", rx)+ fs.Logf(nil, "..Mount said: %s", rx)}if r.scanner.Err() != nil {- log.Printf("scanner err %v", r.scanner.Err())+ fs.Logf(nil, "scanner err %v", r.scanner.Err())}- log.Printf("startMountSubProcess: end")+ fs.Logf(nil, "startMountSubProcess: end")}// Find a free path to run the mount on@@ -101,7 +100,7 @@ func findMountPath() string {if runtime.GOOS != "windows" {mountPath, err := os.MkdirTemp("", "rclonefs-mount")if err != nil {- log.Fatalf("Failed to create mount dir: %v", err)+ fs.Fatalf(nil, "Failed to create mount dir: %v", err)}return mountPath}@@ -110,7 +109,7 @@ func findMountPath() string {letter := file.FindUnusedDriveLetter()drive := ""if letter == 0 {- log.Fatalf("Couldn't find free drive letter for test")+ fs.Fatalf(nil, "Couldn't find free drive letter for test")} else {drive = string(letter) + ":"}@@ -128,36 +127,36 @@ func isSubProcess() bool {// It reads commands from standard input and writes results to// standard output.func startMount(mountFn mountlib.MountFn, useVFS bool, opts string) {- log.Print("startMount")+ fs.Log(nil, "startMount")ctx := context.Background()var opt runMountOpterr := json.Unmarshal([]byte(opts), &opt)if err != nil {- log.Fatalf("Unmarshal failed: %v", err)+ fs.Fatalf(nil, "Unmarshal failed: %v", err)}fstest.Initialise()f, err := cache.Get(ctx, opt.Remote)if err != nil {- log.Fatalf("Failed to open remote %q: %v", opt.Remote, err)+ fs.Fatalf(nil, "Failed to open remote %q: %v", opt.Remote, err)}err = f.Mkdir(ctx, "")if err != nil {- log.Fatalf("Failed to mkdir %q: %v", opt.Remote, err)+ fs.Fatalf(nil, "Failed to mkdir %q: %v", opt.Remote, err)}- log.Printf("startMount: Mounting %q on %q with %q", opt.Remote, opt.MountPoint, opt.VFSOpt.CacheMode)+ fs.Logf(nil, "startMount: Mounting %q on %q with %q", opt.Remote, opt.MountPoint, opt.VFSOpt.CacheMode)mnt := mountlib.NewMountPoint(mountFn, opt.MountPoint, f, &opt.MountOpt, &opt.VFSOpt)_, err = mnt.Mount()if err != nil {- log.Fatalf("mount FAILED %q: %v", opt.Remote, err)+ fs.Fatalf(nil, "mount FAILED %q: %v", opt.Remote, err)}defer umount(mnt)- log.Printf("startMount: mount OK")+ fs.Logf(nil, "startMount: mount OK")fmt.Println("STARTED") // signal to parent all is good// Read commands from stdin@@ -172,7 +171,7 @@ func startMount(mountFn mountlib.MountFn, useVFS bool, opts string) {err = scanner.Err()if err != nil {- log.Fatalf("scanner failed %q: %v", opt.Remote, err)+ fs.Fatalf(nil, "scanner failed %q: %v", opt.Remote, err)}}@@ -221,17 +220,17 @@ func (r *Run) sendMountCommand(args ...string) {} else {_, err := io.WriteString(r.out, tx+"\n")if err != nil {- log.Fatalf("WriteString err %v", err)+ fs.Fatalf(nil, "WriteString err %v", err)}if !r.scanner.Scan() {- log.Fatalf("Mount has gone away")+ fs.Fatalf(nil, "Mount has gone away")}rx = strings.Trim(r.scanner.Text(), "\r\n")}in := strings.Split(rx, "\t")// log.Printf("Answer is %q", in)if in[0] != "OK" {- log.Fatalf("Error from mount: %q", in[1:])+ fs.Fatalf(nil, "Error from mount: %q", in[1:])}}@@ -254,25 +253,25 @@ func umount(mnt *mountlib.MountPoint) {log.Printf("fusermount failed: %v", err)}*/- log.Printf("Unmounting %q", mnt.MountPoint)+ fs.Logf(nil, "Unmounting %q", mnt.MountPoint)err := mnt.Unmount()if err != nil {- log.Printf("signal to umount failed - retrying: %v", err)+ fs.Logf(nil, "signal to umount failed - retrying: %v", err)time.Sleep(3 * time.Second)err = mnt.Unmount()}if err != nil {- log.Fatalf("signal to umount failed: %v", err)+ fs.Fatalf(nil, "signal to umount failed: %v", err)}- log.Printf("Waiting for umount")+ fs.Logf(nil, "Waiting for umount")err = <-mnt.ErrChanif err != nil {- log.Fatalf("umount failed: %v", err)+ fs.Fatalf(nil, "umount failed: %v", err)}// Cleanup the VFS cache - umount has called Shutdownerr = mnt.VFS.CleanUp()if err != nil {- log.Printf("Failed to cleanup the VFS cache: %v", err)+ fs.Logf(nil, "Failed to cleanup the VFS cache: %v", err)}}