Przeglądaj źródła

Merge remote-tracking branch 'origin/dev' into dev

Vanessa 2 lat temu
rodzic
commit
4786cf6dfc
3 zmienionych plików z 2 dodań i 8 usunięć
  1. 0 0
      kernel/api/petal.go
  2. 1 7
      kernel/api/sync.go
  3. 1 1
      kernel/model/sync.go

+ 0 - 0
kernel/api/plugin.go → kernel/api/petal.go


+ 1 - 7
kernel/api/sync.go

@@ -209,13 +209,7 @@ func setSyncMode(c *gin.Context) {
 	}
 
 	mode := int(arg["mode"].(float64))
-	err := model.SetSyncMode(mode)
-	if nil != err {
-		ret.Code = -1
-		ret.Msg = err.Error()
-		ret.Data = map[string]interface{}{"closeTimeout": 5000}
-		return
-	}
+	model.SetSyncMode(mode)
 }
 
 func setSyncProvider(c *gin.Context) {

+ 1 - 1
kernel/model/sync.go

@@ -351,7 +351,7 @@ func SetSyncPerception(b bool) {
 	return
 }
 
-func SetSyncMode(mode int) (err error) {
+func SetSyncMode(mode int) {
 	Conf.Sync.Mode = mode
 	Conf.Save()
 	return