Merge branch 'master' of https://github.com/bingoohuang/seaweedfs

1 files changed, 5 insertions, 7 deletions

diff --git a/weed/notification/configuration.go b/weed/notification/configuration.go
index 7f8765cc3..541a453e9 100644
--- a/weed/notification/configuration.go
+++ b/weed/notification/configuration.go
@@ -4,14 +4,13 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/golang/protobuf/proto"
-	"github.com/spf13/viper"
 )
 
 type MessageQueue interface {
 	// GetName gets the name to locate the configuration in filer.toml file
 	GetName() string
 	// Initialize initializes the file store
-	Initialize(configuration util.Configuration) error
+	Initialize(configuration util.Configuration, prefix string) error
 	SendMessage(key string, message proto.Message) error
 }
 
@@ -21,7 +20,7 @@ var (
 	Queue MessageQueue
 )
 
-func LoadConfiguration(config *viper.Viper) {
+func LoadConfiguration(config *util.ViperProxy, prefix string) {
 
 	if config == nil {
 		return
@@ -30,9 +29,8 @@ func LoadConfiguration(config *viper.Viper) {
 	validateOneEnabledQueue(config)
 
 	for _, queue := range MessageQueues {
-		if config.GetBool(queue.GetName() + ".enabled") {
-			viperSub := config.Sub(queue.GetName())
-			if err := queue.Initialize(viperSub); err != nil {
+		if config.GetBool(prefix + queue.GetName() + ".enabled") {
+			if err := queue.Initialize(config, prefix+queue.GetName()+"."); err != nil {
 				glog.Fatalf("Failed to initialize notification for %s: %+v",
 					queue.GetName(), err)
 			}
@@ -44,7 +42,7 @@ func LoadConfiguration(config *viper.Viper) {
 
 }
 
-func validateOneEnabledQueue(config *viper.Viper) {
+func validateOneEnabledQueue(config *util.ViperProxy) {
 	enabledQueue := ""
 	for _, queue := range MessageQueues {
 		if config.GetBool(queue.GetName() + ".enabled") {