fix(cloudproxy): cloudproxy service auth first (#19499)

This commit is contained in:
屈轩
2024-02-19 12:08:23 +08:00
committed by GitHub
parent e87a0b6cc3
commit cc6eca5b90
2 changed files with 12 additions and 13 deletions
+9
View File
@@ -23,6 +23,9 @@ import (
"yunion.io/x/log"
api "yunion.io/x/onecloud/pkg/apis/cloudproxy"
common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/cloudproxy/agent/worker"
"yunion.io/x/onecloud/pkg/cloudproxy/options"
"yunion.io/x/onecloud/pkg/cloudproxy/service"
@@ -41,6 +44,12 @@ func main() {
opts = options.Get()
)
common_app.InitAuth(&opts.CommonOptions, func() {
log.Infof("Auth complete")
})
common_options.StartOptionManager(opts, opts.ConfigSyncPeriodSeconds, api.SERVICE_TYPE, api.SERVICE_VERSION, options.OnOptionsChange)
wg.Add(1)
go func() {
defer wg.Done()
+3 -13
View File
@@ -18,16 +18,13 @@ import (
"context"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
_ "yunion.io/x/sqlchemy/backends"
api "yunion.io/x/onecloud/pkg/apis/cloudproxy"
"yunion.io/x/onecloud/pkg/cloudcommon"
common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
"yunion.io/x/onecloud/pkg/cloudcommon/consts"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/notifyclient"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/cloudproxy/models"
"yunion.io/x/onecloud/pkg/cloudproxy/options"
"yunion.io/x/onecloud/pkg/mcclient/auth"
@@ -35,18 +32,11 @@ import (
func StartService() {
var (
opts = options.Get()
dbOpts = &opts.DBOptions
baseOpts = &opts.BaseOptions
commonOpts = &opts.CommonOptions
opts = options.Get()
dbOpts = &opts.DBOptions
baseOpts = &opts.BaseOptions
)
common_app.InitAuth(commonOpts, func() {
log.Infof("Auth complete")
})
common_options.StartOptionManager(opts, opts.ConfigSyncPeriodSeconds, api.SERVICE_TYPE, api.SERVICE_VERSION, options.OnOptionsChange)
app := common_app.InitApp(baseOpts, true).
OnException(func(method, path string, body jsonutils.JSONObject, err error) {
ctx := context.Background()