opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16399 from zexi/automated-cherry-pick-of-#16398-upstream-master

Browse Source 
Automated cherry pick of #16398: fix(devtool): panic occurred cause of nil ctx
This commit is contained in:
Zexi Li
2023-04-10 17:16:52 +08:00
committed by GitHub
parent ae2f58c9f6 e736564500
commit 071471a7db
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apigateway/handler/syslog_webservices.go
+3 -3
View File
@@ -132,11 +132,11 @@ func handleSyslogWebServiceMessage(ctx context.Context, w http.ResponseWriter, r
httperrors.ForbiddenError(ctx, w, "syslog webservice not enabled")
return
}
resp := fetchSyslogMessage(r)
resp := fetchSyslogMessage(ctx, r)
appsrv.SendJSON(w, resp)
}
func fetchSyslogMessage(r *http.Request) jsonutils.JSONObject {
func fetchSyslogMessage(ctx context.Context, r *http.Request) jsonutils.JSONObject {
token := r.FormValue("token")
date := r.FormValue("date")
eventId := r.FormValue("eventId")
@@ -170,7 +170,7 @@ func fetchSyslogMessage(r *http.Request) jsonutils.JSONObject {
params.Add(jsonutils.NewString(moduleType), "service")
}
sess := auth.GetAdminSession(nil, "")
sess := auth.GetAdminSession(ctx, "")
logs, err := modules.Actions.List(sess, params)
if err != nil {
ret.Code = 2
pkg/devtool/models/devtoolcronjob.go
+4 -4
View File
@@ -110,10 +110,10 @@ func AddOneCronjob(item *SCronjob, s *mcclient.ClientSession) error {
return nil
}
func InitializeCronjobs() error {
func InitializeCronjobs(ctx context.Context) error {
DevToolCronManager = cronman.InitCronJobManager(true, 8)
DevToolCronManager.Start()
Session := auth.GetAdminSession(nil, "")
Session := auth.GetAdminSession(ctx, "")
go func() {
items := make([]SCronjob, 0)
@@ -131,7 +131,7 @@ func InitializeCronjobs() error {
}
func (job *SCronjob) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerID mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
Session := auth.GetAdminSession(nil, "")
Session := auth.GetAdminSession(ctx, "")
job.SStandaloneResourceBase.PostCreate(ctx, userCred, nil, query, data)
AddOneCronjob(job, Session)
}
@@ -141,7 +141,7 @@ func (job *SCronjob) PostDelete(ctx context.Context, userCred mcclient.TokenCred
}
func (job *SCronjob) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {
Session := auth.GetAdminSession(nil, "")
Session := auth.GetAdminSession(ctx, "")
job.SStandaloneResourceBase.PostUpdate(ctx, userCred, query, data)
DevToolCronManager.Remove(job.Id)
AddOneCronjob(job, Session)
pkg/devtool/service/service.go
+1 -1
View File
@@ -54,7 +54,7 @@ func StartService() {
InitHandlers(app)
db.EnsureAppSyncDB(app, dbOpts, models.InitDB)
models.InitializeCronjobs()
models.InitializeCronjobs(app.GetContext())
app_common.ServeForeverWithCleanup(app, baseOpts, func() {
cloudcommon.CloseDB()