Browse Source

fail fast if two notification queues or inputs are enabled

pull/800/head
Chris Lu 6 years ago
parent
commit
ffa2827ab1
  1. 11
      weed/command/filer_replication.go
  2. 25
      weed/notification/configuration.go

11
weed/command/filer_replication.go

@ -41,6 +41,17 @@ func runFilerReplicate(cmd *Command, args []string) bool {
var notificationInput sub.NotificationInput var notificationInput sub.NotificationInput
enabledInput := ""
for _, input := range sub.NotificationInputs {
if config.GetBool("notification." + input.GetName() + ".enabled") {
if enabledInput == "" {
enabledInput = input.GetName()
} else {
glog.Fatalf("Notification input is enabled for both %s and %s", enabledInput, input.GetName())
}
}
}
for _, input := range sub.NotificationInputs { for _, input := range sub.NotificationInputs {
if config.GetBool("notification." + input.GetName() + ".enabled") { if config.GetBool("notification." + input.GetName() + ".enabled") {
viperSub := config.Sub("notification." + input.GetName()) viperSub := config.Sub("notification." + input.GetName())

25
weed/notification/configuration.go

@ -27,15 +27,26 @@ func LoadConfiguration(config *viper.Viper) {
return return
} }
for _, store := range MessageQueues {
if config.GetBool(store.GetName() + ".enabled") {
viperSub := config.Sub(store.GetName())
if err := store.Initialize(viperSub); err != nil {
enabledQueue := ""
for _, queue := range MessageQueues {
if config.GetBool(queue.GetName() + ".enabled") {
if enabledQueue == "" {
enabledQueue = queue.GetName()
} else {
glog.Fatalf("Notification message queue is enabled for both %s and %s", enabledQueue, queue.GetName())
}
}
}
for _, queue := range MessageQueues {
if config.GetBool(queue.GetName() + ".enabled") {
viperSub := config.Sub(queue.GetName())
if err := queue.Initialize(viperSub); err != nil {
glog.Fatalf("Failed to initialize notification for %s: %+v", glog.Fatalf("Failed to initialize notification for %s: %+v",
store.GetName(), err)
queue.GetName(), err)
} }
Queue = store
glog.V(0).Infof("Configure notification message queue for %s", store.GetName())
Queue = queue
glog.V(0).Infof("Configure notification message queue for %s", queue.GetName())
return return
} }
} }

Loading…
Cancel
Save