mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-08-29 03:51:54 +08:00
fix(cloudproxy): cloudproxy service auth first (#19499)
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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()
|
||||
|
||||
Reference in New Issue
Block a user