Skip to content

Commit

Permalink
Grab packs and schedule only if dashboard is enabled
Browse files Browse the repository at this point in the history
  • Loading branch information
javuto committed Jan 20, 2021
1 parent 4402988 commit 95b43af
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions admin/handlers/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -926,19 +926,24 @@ func (h *HandlersAdmin) NodeHandler(w http.ResponseWriter, r *http.Request) {
nodeEnv = e
}
}
// Get query packs for this environment
packs, err := h.Envs.NodePacksEntries([]byte(nodeEnv.Packs), node.Platform)
if err != nil {
h.Inc(metricAdminErr)
log.Printf("error getting packs: %v", err)
return
}
// Get the schedule for this environment
schedule, err := h.Envs.NodeStructSchedule([]byte(nodeEnv.Schedule), node.Platform)
if err != nil {
h.Inc(metricAdminErr)
log.Printf("error getting schedule: %v", err)
return
// If dashboard enabled, retrieve packs and schedule
dashboardEnabled := h.Settings.NodeDashboard()
var packs environments.PacksEntries
var schedule environments.ScheduleConf
if dashboardEnabled {
packs, err = h.Envs.NodePacksEntries([]byte(nodeEnv.Packs), node.Platform)
if err != nil {
h.Inc(metricAdminErr)
log.Printf("error getting packs: %v", err)
return
}
// Get the schedule for this environment
schedule, err = h.Envs.NodeStructSchedule([]byte(nodeEnv.Schedule), node.Platform)
if err != nil {
h.Inc(metricAdminErr)
log.Printf("error getting schedule: %v", err)
return
}
}
// Prepare template data
templateData := NodeTemplateData{
Expand All @@ -949,7 +954,7 @@ func (h *HandlersAdmin) NodeHandler(w http.ResponseWriter, r *http.Request) {
TagsForNode: tags,
Environments: h.allowedEnvironments(ctx[sessions.CtxUser], envAll),
Platforms: platforms,
Dashboard: h.Settings.NodeDashboard(),
Dashboard: dashboardEnabled,
Packs: packs,
Schedule: schedule,
}
Expand Down

0 comments on commit 95b43af

Please sign in to comment.