ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 13:29:05 +01:00
Code Issues Packages Releases Activity

Cleanup debug logging, keep orderBy param for repo.Find

Browse Source
This commit is contained in:
Christoph Kluge 2024-10-31 15:47:45 +01:00
parent 2c8b73e2e2
commit 939dd2320a
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/rest.go
View File

@ -929,7 +929,7 @@ func (api *RestApi) stopJobByRequest(rw http.ResponseWriter, r *http.Request) {
return return
} }
log.Printf("loading db job for stopJobByRequest... : stopJobApiRequest=%v", req) // log.Printf("loading db job for stopJobByRequest... : stopJobApiRequest=%v", req)
job, err = api.JobRepository.Find(req.JobId, req.Cluster, req.StartTime) job, err = api.JobRepository.Find(req.JobId, req.Cluster, req.StartTime)
if err != nil { if err != nil {

6
internal/repository/job.go
View File

@ -235,10 +235,10 @@ func (r *JobRepository) Find(
q = q.Where("job.start_time = ?", *startTime) q = q.Where("job.start_time = ?", *startTime)
} }
q = q.OrderBy("job.id DESC") // always use newest matching job by db id q = q.OrderBy("job.id DESC") // always use newest matching job by db id if more than one match
s, args, _ := q.ToSql() // s, args, _ := q.ToSql()
log.Printf("trying to find db job with query: %s | %v", s, args) // log.Printf("trying to find db job with query: %s | %v", s, args)
log.Debugf("Timer Find %s", time.Since(start)) log.Debugf("Timer Find %s", time.Since(start))
return scanJob(q.RunWith(r.stmtCache).QueryRow()) return scanJob(q.RunWith(r.stmtCache).QueryRow())

15
internal/routerConfig/routes.go
View File

@ -51,21 +51,19 @@ func setupHomeRoute(i InfoType, r *http.Request) InfoType {
jobRepo := repository.GetJobRepository() jobRepo := repository.GetJobRepository()
groupBy := model.AggregateCluster groupBy := model.AggregateCluster
log.Infof(">>> HELLO HOME ROUTE") // startJobCount := time.Now()
startJobCount := time.Now()
stats, err := jobRepo.JobCountGrouped(r.Context(), nil, &groupBy) stats, err := jobRepo.JobCountGrouped(r.Context(), nil, &groupBy)
if err != nil { if err != nil {
log.Warnf("failed to count jobs: %s", err.Error()) log.Warnf("failed to count jobs: %s", err.Error())
} }
log.Infof("Timer HOME ROUTE startJobCount: %s", time.Since(startJobCount)) // log.Infof("Timer HOME ROUTE startJobCount: %s", time.Since(startJobCount))
startRunningJobCount := time.Now() // startRunningJobCount := time.Now()
stats, err = jobRepo.AddJobCountGrouped(r.Context(), nil, &groupBy, stats, "running") stats, err = jobRepo.AddJobCountGrouped(r.Context(), nil, &groupBy, stats, "running")
if err != nil { if err != nil {
log.Warnf("failed to count running jobs: %s", err.Error()) log.Warnf("failed to count running jobs: %s", err.Error())
} }
log.Infof("Timer HOME ROUTE startRunningJobCount: %s", time.Since(startRunningJobCount)) // log.Infof("Timer HOME ROUTE startRunningJobCount: %s", time.Since(startRunningJobCount))
i["clusters"] = stats i["clusters"] = stats
@ -78,8 +76,6 @@ func setupHomeRoute(i InfoType, r *http.Request) InfoType {
} }
} }
log.Infof("... BYE HOME ROUTE")
return i return i
} }
@ -262,8 +258,6 @@ func SetupRoutes(router *mux.Router, buildInfo web.Build) {
for _, route := range routes { for _, route := range routes {
route := route route := route
router.HandleFunc(route.Route, func(rw http.ResponseWriter, r *http.Request) { router.HandleFunc(route.Route, func(rw http.ResponseWriter, r *http.Request) {
log.Info(">>> HELLO ROUTE HANDLER ...")
conf, err := userCfgRepo.GetUIConfig(repository.GetUserFromContext(r.Context())) conf, err := userCfgRepo.GetUIConfig(repository.GetUserFromContext(r.Context()))
if err != nil { if err != nil {
http.Error(rw, err.Error(), http.StatusInternalServerError) http.Error(rw, err.Error(), http.StatusInternalServerError)
@ -294,7 +288,6 @@ func SetupRoutes(router *mux.Router, buildInfo web.Build) {
if route.Filter { if route.Filter {
page.FilterPresets = buildFilterPresets(r.URL.Query()) page.FilterPresets = buildFilterPresets(r.URL.Query())
} }
log.Infof("... ROUTE HANDLED: %s for %v", page.Title, page.User)
web.RenderTemplate(rw, route.Template, &page) web.RenderTemplate(rw, route.Template, &page)
}) })