Change emptylocker to defaultlocker (#288)

baetyl · Mar 18, 2021 · 7b3b1d5 · 7b3b1d5
1 parent 50a7f34
commit 7b3b1d5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -38,7 +38,7 @@ type CloudConfig struct {
 		Property   string   `yaml:"property" json:"property" default:"database"`
 		Module     string   `yaml:"module" json:"module" default:"database"`
 		SyncLinks  []string `yaml:"synclinks" json:"synclinks" default:"[\"httplink\"]"`
-		Locker     string   `yaml:"locker" json:"locker" default:"emptylocker"`
+		Locker     string   `yaml:"locker" json:"locker" default:"defaultlocker"`
 		Task       string   `yaml:"task" json:"task" default:"database"`
 		DM         string   `yaml:"dm" json:"dm" default:"databaseext"`
 	} `yaml:"plugin" json:"plugin"`

diff --git a/config/config_test.go b/config/config_test.go
@@ -50,7 +50,7 @@ func TestDefaultValue(t *testing.T) {
 	expect.Plugin.Module = "database"
 	expect.Plugin.SyncLinks = []string{"httplink"}
 	expect.Plugin.Pubsub = "defaultpubsub"
-	expect.Plugin.Locker = "emptylocker"
+	expect.Plugin.Locker = "defaultlocker"
 	expect.Plugin.Task = "database"
 	expect.Lock.ExpireTime = 5
 	expect.Plugin.DM = "databaseext"

diff --git a/plugin/default/lock/config.go b/plugin/default/lock/config.go
@@ -3,5 +3,5 @@ package lock
 type CloudConfig struct {
 	DefaultLocker struct {
 		Storage string `yaml:"storage" json:"storage" default:"database"`
-	} `yaml:"emptylocker" json:"emptylocker"`
+	} `yaml:"defaultlocker" json:"defaultlocker"`
 }
diff --git a/plugin/default/lock/empty_lock.go b/plugin/default/lock/empty_lock.go
@@ -3,7 +3,7 @@ package lock
 import "github.com/baetyl/baetyl-cloud/v2/plugin"
 
 func init() {
-	plugin.RegisterFactory("emptylocker", New)
+	plugin.RegisterFactory("defaultlocker", New)
 }
 
 type emptyLocker struct{}