Code refactoring

cmd/gofs/main.go

@@ -99,11 +99,7 @@ func main() {
  log.Error(err, "create the instance of Monitor error")
  return
  }
- defer func() {
- if err = monitor.Close(); err != nil {
- log.Error(err, "close monitor error")
- }
- }()
+ defer monitor.Close()
 
  // start monitor
  log.Log("monitor is starting...")

monitor/monitor.go

@@ -27,7 +27,7 @@ func NewMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, enableTLS bo
  } else if src.Is(core.RemoteDisk) && src.Server() {
  return NewFsNotifyMonitor(syncer, retry, syncOnce)
  } else if src.Is(core.RemoteDisk) && !src.Server() {
- return NewRemoteClientMonitor(syncer, retry, syncOnce, src.Host(), src.Port(), enableTLS, certFile, keyFile, users)
+ return NewRemoteClientMonitor(syncer, retry, syncOnce, src.Host(), src.Port(), enableTLS, users)
  }
  return nil, fmt.Errorf("file system unsupported ! src=>%s", src.Type().String())
 

monitor/remote_client_monitor.go

@@ -31,7 +31,7 @@ type message struct {
 }
 
 // NewRemoteClientMonitor create an instance of remoteClientMonitor to monitor the remote file change
-func NewRemoteClientMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, host string, port int, enableTLS bool, certFile string, keyFile string, users []*auth.User) (Monitor, error) {
+func NewRemoteClientMonitor(syncer sync.Sync, retry retry.Retry, syncOnce bool, host string, port int, enableTLS bool, users []*auth.User) (Monitor, error) {
  if syncer == nil {
  err := errors.New("syncer can't be nil")
  return nil, err

server/middleware/login.go

@@ -25,8 +25,7 @@ func NewLoginHandler(users []*auth.User) handler.GinHandler {
 
 func (h *loginHandler) Handle(c *gin.Context) {
  defer func() {
- e := recover()
- if e != nil {
+ if e := recover(); e != nil {
  log.Error(fmt.Errorf("%v", e), "user login error")
  c.String(http.StatusOK, "user login error")
  }

server/server.go

@@ -95,8 +95,7 @@ func ReleaseTemplate(releasePath string, serverTemplateOverride bool) error {
  if err != nil {
  return err
  }
- err = os.MkdirAll(filepath.ToSlash(releasePath), os.ModePerm)
- if err != nil {
+ if err = os.MkdirAll(filepath.ToSlash(releasePath), os.ModePerm); err != nil {
  return err
  }
  for _, f := range files {

tran/tcpserver.go

@@ -47,8 +47,6 @@ func NewServer(ip string, port int, enableTLS bool, certFile string, keyFile str
  }
  if len(srv.users) == 0 {
  log.Warn("the tcp server allows anonymous access, you should set some server users by the -users or -rand_user_count flag for security reasons")
- } else {
-
  }
  return srv
 }

util/hash.go

@@ -10,6 +10,7 @@ import (
 )
 
 // MD5FromFile calculate the hash value of the file
+// If you reuse the file reader, please set its offset to start position first, like os.File.Seek
 func MD5FromFile(file io.Reader, bufSize int) (hash string, err error) {
  if file == nil {
  err = errors.New("file is nil")