From adeda5708289bb5636ff19ef5bc184e8778d3c35 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Mon, 6 Apr 2020 15:43:29 +0800
Subject: [PATCH] fix: service config changes not effective

---
 pkg/apigateway/options/options.go  |  5 +++--
 pkg/cloudcommon/consts/consts.go   |  3 +++
 pkg/cloudcommon/options/changes.go | 17 +++++++++++------
 pkg/compute/options/options.go     |  5 +++--
 pkg/image/options/options.go       |  5 +++--
 pkg/keystone/options/options.go    |  5 +++--
 pkg/notify/options/options.go      |  8 +++++---
 pkg/webconsole/options/options.go  |  5 +++--
 8 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/pkg/apigateway/options/options.go b/pkg/apigateway/options/options.go
index 5a2df99e14..a0f16611f1 100644
--- a/pkg/apigateway/options/options.go
+++ b/pkg/apigateway/options/options.go
@@ -40,9 +40,10 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*GatewayOptions)
 	newOpts := newO.(*GatewayOptions)
 
+	changed := false
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }
diff --git a/pkg/cloudcommon/consts/consts.go b/pkg/cloudcommon/consts/consts.go
index 8cd2203500..bdd39358fe 100644
--- a/pkg/cloudcommon/consts/consts.go
+++ b/pkg/cloudcommon/consts/consts.go
@@ -16,6 +16,8 @@ package consts
 
 import (
 	"time"
+
+	"yunion.io/x/log"
 )
 
 var (
@@ -60,6 +62,7 @@ func GetTenantCacheExpireSeconds() time.Duration {
 }
 
 func SetNonDefaultDomainProjects(val bool) {
+	log.Infof("set non_default_domain_projects to %v", val)
 	nonDefaultDomainProjects = val
 }
 
diff --git a/pkg/cloudcommon/options/changes.go b/pkg/cloudcommon/options/changes.go
index 428641c933..03d42d77e4 100644
--- a/pkg/cloudcommon/options/changes.go
+++ b/pkg/cloudcommon/options/changes.go
@@ -22,30 +22,35 @@ func OnBaseOptionsChange(oOpts, nOpts interface{}) bool {
 	oldOpts := oOpts.(*BaseOptions)
 	newOpts := nOpts.(*BaseOptions)
 
+	changed := false
 	if oldOpts.RequestWorkerCount != newOpts.RequestWorkerCount {
-		return true
+		changed = true
 	}
 	if oldOpts.TimeZone != newOpts.TimeZone {
-		return true
+		changed = true
 	}
 	if oldOpts.EnableRbac != newOpts.EnableRbac {
-		return true
+		changed = true
 	}
 	if oldOpts.NonDefaultDomainProjects != newOpts.NonDefaultDomainProjects {
 		consts.SetNonDefaultDomainProjects(newOpts.NonDefaultDomainProjects)
+		changed = true
 	}
 	if oldOpts.DomainizedNamespace != newOpts.DomainizedNamespace {
 		consts.SetDomainizedNamespace(newOpts.DomainizedNamespace)
+		changed = true
 	}
-	return false
+	return changed
 }
 
 func OnCommonOptionsChange(oOpts, nOpts interface{}) bool {
 	oldOpts := oOpts.(*CommonOptions)
 	newOpts := nOpts.(*CommonOptions)
 
+	changed := false
 	if OnBaseOptionsChange(&oldOpts.BaseOptions, &newOpts.BaseOptions) {
-		return true
+		changed = true
 	}
-	return false
+
+	return changed
 }
diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go
index a4bf76b274..79a8d17625 100644
--- a/pkg/compute/options/options.go
+++ b/pkg/compute/options/options.go
@@ -158,8 +158,9 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*ComputeOptions)
 	newOpts := newO.(*ComputeOptions)
 
+	changed := false
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
-	return false
+	return changed
 }
diff --git a/pkg/image/options/options.go b/pkg/image/options/options.go
index dc90cf7384..ad087ddd19 100644
--- a/pkg/image/options/options.go
+++ b/pkg/image/options/options.go
@@ -51,9 +51,10 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*SImageOptions)
 	newOpts := newO.(*SImageOptions)
 
+	changed := false
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }
diff --git a/pkg/keystone/options/options.go b/pkg/keystone/options/options.go
index e904555d07..d996fbce12 100644
--- a/pkg/keystone/options/options.go
+++ b/pkg/keystone/options/options.go
@@ -59,9 +59,10 @@ func OnOptionsChange(oldOptions, newOptions interface{}) bool {
 	oldOpts := oldOptions.(*SKeystoneOptions)
 	newOpts := newOptions.(*SKeystoneOptions)
 
+	changed := false
 	if options.OnBaseOptionsChange(&oldOpts.BaseOptions, &newOpts.BaseOptions) {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }
diff --git a/pkg/notify/options/options.go b/pkg/notify/options/options.go
index 7d98829cb4..6928effba8 100644
--- a/pkg/notify/options/options.go
+++ b/pkg/notify/options/options.go
@@ -41,13 +41,15 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*NotifyOption)
 	newOpts := newO.(*NotifyOption)
 
+	changed := false
+
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
 
 	if oldOpts.SocketFileDir != newOpts.SocketFileDir {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }
diff --git a/pkg/webconsole/options/options.go b/pkg/webconsole/options/options.go
index 67fdedab33..3498d4dcd0 100644
--- a/pkg/webconsole/options/options.go
+++ b/pkg/webconsole/options/options.go
@@ -36,9 +36,10 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*WebConsoleOptions)
 	newOpts := newO.(*WebConsoleOptions)
 
+	changed := false
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }