Quellcode durchsuchen

Run go fmt

Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
Shengqi Chen vor 8 Monaten
Ursprung
Commit
ef32197fef

+ 2 - 2
cmd/tunasync/tunasync.go

@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/moby/moby/pkg/reexec"
 	"github.com/pkg/profile"
-	"gopkg.in/op/go-logging.v1"
 	"github.com/urfave/cli"
-	"github.com/moby/moby/pkg/reexec"
+	"gopkg.in/op/go-logging.v1"
 
 	tunasync "github.com/tuna/tunasync/internal"
 	"github.com/tuna/tunasync/manager"

+ 1 - 0
tests/httpClient.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

+ 1 - 0
tests/httpServer.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

+ 1 - 0
tests/managerMain.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

+ 1 - 0
tests/workerMain.go

@@ -1,3 +1,4 @@
+//go:build ignore
 // +build ignore
 
 package main

+ 1 - 0
worker/btrfs_snapshot_hook.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package worker

+ 1 - 0
worker/btrfs_snapshot_hook_nolinux.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package worker

+ 2 - 2
worker/config.go

@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 
 	"github.com/BurntSushi/toml"
-	"github.com/imdario/mergo"
-	units "github.com/docker/go-units"
 	cgv1 "github.com/containerd/cgroups"
 	cgv2 "github.com/containerd/cgroups/v2"
+	units "github.com/docker/go-units"
+	"github.com/imdario/mergo"
 )
 
 type providerEnum uint8

+ 6 - 6
worker/docker.go

@@ -10,9 +10,9 @@ import (
 
 type dockerHook struct {
 	emptyHook
-	image   string
-	volumes []string
-	options []string
+	image       string
+	volumes     []string
+	options     []string
 	memoryLimit MemBytes
 }
 
@@ -33,9 +33,9 @@ func newDockerHook(p mirrorProvider, gCfg dockerConfig, mCfg mirrorConfig) *dock
 		emptyHook: emptyHook{
 			provider: p,
 		},
-		image:   mCfg.DockerImage,
-		volumes: volumes,
-		options: options,
+		image:       mCfg.DockerImage,
+		volumes:     volumes,
+		options:     options,
 		memoryLimit: mCfg.MemoryLimit,
 	}
 }

+ 6 - 4
worker/job.go

@@ -87,10 +87,12 @@ func (m *mirrorJob) SetProvider(provider mirrorProvider) error {
 
 // runMirrorJob is the goroutine where syncing job runs in
 // arguments:
-//    provider: mirror provider object
-//    ctrlChan: receives messages from the manager
-//    managerChan: push messages to the manager, this channel should have a larger buffer
-//    sempaphore: make sure the concurrent running syncing job won't explode
+//
+//	provider: mirror provider object
+//	ctrlChan: receives messages from the manager
+//	managerChan: push messages to the manager, this channel should have a larger buffer
+//	sempaphore: make sure the concurrent running syncing job won't explode
+//
 // TODO: message struct for managerChan
 func (m *mirrorJob) Run(managerChan chan<- jobMessage, semaphore chan empty) error {
 	jobsDone.Add(1)

+ 1 - 1
worker/rsync_provider.go

@@ -67,7 +67,7 @@ func newRsyncProvider(c rsyncConfig) (*rsyncProvider, error) {
 
 	options := []string{
 		"-aHvh", "--no-o", "--no-g", "--stats",
-		"--filter" , "risk .~tmp~/", "--exclude", ".~tmp~/",
+		"--filter", "risk .~tmp~/", "--exclude", ".~tmp~/",
 		"--delete", "--delete-after", "--delay-updates",
 		"--safe-links",
 	}

+ 6 - 6
worker/runner.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/codeskyblue/go-sh"
-	"golang.org/x/sys/unix"
-	"github.com/moby/moby/pkg/reexec"
 	cgv1 "github.com/containerd/cgroups"
+	"github.com/moby/moby/pkg/reexec"
+	"golang.org/x/sys/unix"
 )
 
 // runner is to run os commands giving command line, env and log file
@@ -60,7 +60,7 @@ func newCmdJob(provider mirrorProvider, cmdAndArgs []string, workingDir string,
 		}
 		// set memlimit
 		if d.memoryLimit != 0 {
-		  args = append(args, "-m", fmt.Sprint(d.memoryLimit.Value()))
+			args = append(args, "-m", fmt.Sprint(d.memoryLimit.Value()))
 		}
 		// apply options
 		args = append(args, d.options...)
@@ -115,7 +115,7 @@ func (c *cmdJob) Start() error {
 	if cg != nil {
 		logger.Debugf("Preparing cgroup sync pipes for job %s", c.provider.Name())
 		var err error
-		pipeR, pipeW, err = os.Pipe();
+		pipeR, pipeW, err = os.Pipe()
 		if err != nil {
 			return err
 		}
@@ -139,7 +139,7 @@ func (c *cmdJob) Start() error {
 		}
 		pid := c.cmd.Process.Pid
 		if cg.cgCfg.isUnified {
-			if err := cg.cgMgrV2.AddProc(uint64(pid)); err != nil{
+			if err := cg.cgMgrV2.AddProc(uint64(pid)); err != nil {
 				if errors.Is(err, syscall.ESRCH) {
 					logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
 				} else {
@@ -147,7 +147,7 @@ func (c *cmdJob) Start() error {
 				}
 			}
 		} else {
-			if err := cg.cgMgrV1.Add(cgv1.Process{Pid: pid}); err != nil{
+			if err := cg.cgMgrV1.Add(cgv1.Process{Pid: pid}); err != nil {
 				if errors.Is(err, syscall.ESRCH) {
 					logger.Infof("Write pid %d to cgroup failed: process vanished, ignoring")
 				} else {