fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/cloudproxy/main.go
View File

@@ -23,6 +23,9 @@ import (
"yunion.io/x/log" "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/agent/worker"
"yunion.io/x/onecloud/pkg/cloudproxy/options" "yunion.io/x/onecloud/pkg/cloudproxy/options"
"yunion.io/x/onecloud/pkg/cloudproxy/service" "yunion.io/x/onecloud/pkg/cloudproxy/service"
@@ -41,6 +44,12 @@ func main() {
opts = options.Get() 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) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()

16
pkg/cloudproxy/service/service.go
View File

@@ -18,16 +18,13 @@ import (
"context" "context"
"yunion.io/x/jsonutils" "yunion.io/x/jsonutils"
"yunion.io/x/log"
_ "yunion.io/x/sqlchemy/backends" _ "yunion.io/x/sqlchemy/backends"
api "yunion.io/x/onecloud/pkg/apis/cloudproxy"
"yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/cloudcommon"
common_app "yunion.io/x/onecloud/pkg/cloudcommon/app" common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
"yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/consts"
"yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" "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/models"
"yunion.io/x/onecloud/pkg/cloudproxy/options" "yunion.io/x/onecloud/pkg/cloudproxy/options"
"yunion.io/x/onecloud/pkg/mcclient/auth" "yunion.io/x/onecloud/pkg/mcclient/auth"
@@ -35,18 +32,11 @@ import (
func StartService() { func StartService() {
var ( var (
opts = options.Get() opts = options.Get()
dbOpts = &opts.DBOptions dbOpts = &opts.DBOptions
baseOpts = &opts.BaseOptions baseOpts = &opts.BaseOptions
commonOpts = &opts.CommonOptions
) )
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). app := common_app.InitApp(baseOpts, true).
OnException(func(method, path string, body jsonutils.JSONObject, err error) { OnException(func(method, path string, body jsonutils.JSONObject, err error) {
ctx := context.Background() ctx := context.Background()