Merge 8e3b4a3 into 8702c56

zouyx · Jul 20, 2020 · 66ce150 · 66ce150
2 parents 8702c56 + 8e3b4a3
commit 66ce150
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 9 deletions.
diff --git a/component/notify/change_event_test.go b/component/notify/change_event_test.go
@@ -42,6 +42,10 @@ func (c *CustomChangeListener) OnChange(changeEvent *storage.ChangeEvent) {
 	Assert(c.t, storage.ADDED, Equal(changeEvent.Changes["key2"].ChangeType))
 }
 
+func (c *CustomChangeListener) OnNewestChange(configuration map[string]interface{}) {
+
+}
+
 func TestListenChangeEvent(t *testing.T) {
 	go buildNotifyResult(t)
 	group := sync.WaitGroup{}

diff --git a/storage/change_event.go b/storage/change_event.go
@@ -22,6 +22,9 @@ func init() {
 type ChangeListener interface {
 	//OnChange 增加变更监控
 	OnChange(event *ChangeEvent)
+
+	//OnNewestChange 监控最新变更
+	OnNewestChange(configuration map[string]interface{})
 }
 
 //config change type
@@ -67,14 +70,26 @@ func GetChangeListeners() *list.List {
 
 //push config change event
 func pushChangeEvent(event *ChangeEvent) {
+	pushChange(func(listener ChangeListener) {
+		go listener.OnChange(event)
+	})
+}
+
+func pushNewestChanges(configuration map[string]interface{}) {
+	pushChange(func(listener ChangeListener) {
+		go listener.OnNewestChange(configuration)
+	})
+}
+
+func pushChange(f func(ChangeListener)) {
 	// if channel is null ,mean no listener,don't need to push msg
 	if changeListeners == nil || changeListeners.Len() == 0 {
 		return
 	}
 
 	for i := changeListeners.Front(); i != nil; i = i.Next() {
 		listener := i.Value.(ChangeListener)
-		go listener.OnChange(event)
+		f(listener)
 	}
 }
 

diff --git a/storage/change_event_test.go b/storage/change_event_test.go
@@ -21,6 +21,10 @@ func (t *CustomChangeListener) OnChange(event *ChangeEvent) {
 	t.w.Done()
 }
 
+func (t *CustomChangeListener) OnNewestChange(configuration map[string]interface{}) {
+
+}
+
 func TestAddChangeListener(t *testing.T) {
 
 	AddChangeListener(nil)

diff --git a/storage/event_dispatch.go b/storage/event_dispatch.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	fmtInvalidKey        = "invalid key format for key %s"
+	fmtInvalidKey = "invalid key format for key %s"
 )
 
 var (
@@ -45,7 +45,9 @@ func UseEventDispatch() {
 }
 
 // RegisterListener 为某些key注释Listener
-func RegisterListener(listener Listener, keys ...string) error {return eventDispatch.RegisterListener(listener, keys...)}
+func RegisterListener(listener Listener, keys ...string) error {
+	return eventDispatch.RegisterListener(listener, keys...)
+}
 
 // RegisterListener 是为某些key注释Listener的方法
 func (d *Dispatcher) RegisterListener(listenerObject Listener, keys ...string) error {
@@ -86,7 +88,9 @@ func invalidKey(key string) bool {
 }
 
 // UnRegisterListener 为某些key注释Listener
-func UnRegisterListener(listenerObj Listener, keys ...string) error {return eventDispatch.UnRegisterListener(listenerObj, keys...)}
+func UnRegisterListener(listenerObj Listener, keys ...string) error {
+	return eventDispatch.UnRegisterListener(listenerObj, keys...)
+}
 
 // UnRegisterListener 用于为某些key注释Listener
 func (d *Dispatcher) UnRegisterListener(listenerObj Listener, keys ...string) error {
@@ -116,7 +120,7 @@ func (d *Dispatcher) UnRegisterListener(listenerObj Listener, keys ...string) er
 }
 
 //OnChange 实现Apollo的ChangeEvent处理
-func (d *Dispatcher) OnChange(changeEvent *ChangeEvent){
+func (d *Dispatcher) OnChange(changeEvent *ChangeEvent) {
 	if changeEvent == nil {
 		return
 	}
@@ -126,6 +130,10 @@ func (d *Dispatcher) OnChange(changeEvent *ChangeEvent){
 	}
 }
 
+func (d *Dispatcher) OnNewestChange(configuration map[string]interface{}) {
+
+}
+
 func (d *Dispatcher) dispatchEvent(eventKey string, event *ConfigChange) {
 	for regKey, listenerList := range d.listeners {
 		matched, err := regexp.MatchString(regKey, eventKey)
@@ -145,7 +153,7 @@ func (d *Dispatcher) dispatchEvent(eventKey string, event *ConfigChange) {
 func convertToEvent(key string, event *ConfigChange) *Event {
 	e := &Event{
 		EventType: event.ChangeType,
-		Key: key,
+		Key:       key,
 	}
 	switch event.ChangeType {
 	case ADDED:

diff --git a/storage/repository.go b/storage/repository.go
@@ -193,9 +193,16 @@ func UpdateApolloConfig(apolloConfig *env.ApolloConfig, isBackupConfig bool) {
 		log.Error("apolloConfig is null,can't update!")
 		return
 	}
+
+	//update apollo connection config
+	env.SetCurrentApolloConfig(apolloConfig.NamespaceName, &apolloConfig.ApolloConnConfig)
+
 	//get change list
 	changeList := UpdateApolloConfigCache(apolloConfig.Configurations, configCacheExpireTime, apolloConfig.NamespaceName)
 
+	//push all newest changes
+	pushNewestChanges(apolloConfig.Configurations)
+
 	if len(changeList) > 0 {
 		//create config change event base on change list
 		event := createConfigChangeEvent(changeList, apolloConfig.NamespaceName)
@@ -204,9 +211,6 @@ func UpdateApolloConfig(apolloConfig *env.ApolloConfig, isBackupConfig bool) {
 		pushChangeEvent(event)
 	}
 
-	//update apollo connection config
-	env.SetCurrentApolloConfig(apolloConfig.NamespaceName, &apolloConfig.ApolloConnConfig)
-
 	if isBackupConfig {
 		//write config file async
 		go extension.GetFileHandler().WriteConfigFile(apolloConfig, env.GetPlainAppConfig().GetBackupConfigPath())