ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-03-25 09:07:30 +01:00
Code Issues Packages Releases Activity

Merge pull request #536 from ClusterCockpit/hotfix

Browse Source 
Hotfix
This commit is contained in:
Jan Eitzinger
2026-03-25 07:07:49 +01:00
committed by GitHub
parent c3b6d93941 c267501a1b
commit b7e133fbaf
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cc-backend/server.go
View File

@@ -357,8 +357,8 @@ func (s *Server) Start(ctx context.Context) error {
s.server = &http.Server{ s.server = &http.Server{
ReadHeaderTimeout: readHeaderTimeout, ReadHeaderTimeout: readHeaderTimeout,
WriteTimeout: writeTimeout, WriteTimeout: writeTimeout,
Handler: s.router, Handler: s.router,
Addr: config.Keys.Addr, Addr: config.Keys.Addr,
} }
// Start http or https server // Start http or https server
@@ -444,7 +444,7 @@ func (s *Server) Shutdown(ctx context.Context) {
select { select {
case <-done: case <-done:
case <-time.After(10 * time.Second): case <-time.After(60 * time.Second):
cclog.Warn("Shutdown deadline exceeded, forcing exit") cclog.Warn("Shutdown deadline exceeded, forcing exit")
} }
} }

6
internal/tagger/classifyJob.go
View File

@@ -363,7 +363,7 @@ func (t *JobClassTagger) Match(job *schema.Job) {
for _, m := range ri.metrics { for _, m := range ri.metrics {
stats, ok := jobStats[m] stats, ok := jobStats[m]
if !ok { if !ok {
cclog.Errorf("job classification: missing metric '%s' for rule %s on job %d", m, tag, job.JobID) cclog.Debugf("job classification: missing metric '%s' for rule %s on job %d", m, tag, job.JobID)
skipRule = true skipRule = true
break break
} }
@@ -388,7 +388,7 @@ func (t *JobClassTagger) Match(job *schema.Job) {
for _, r := range ri.requirements { for _, r := range ri.requirements {
ok, err := expr.Run(r, env) ok, err := expr.Run(r, env)
if err != nil { if err != nil {
cclog.Errorf("error running requirement for rule %s: %#v", tag, err) cclog.Debugf("error running requirement for rule %s: %#v", tag, err)
requirementsMet = false requirementsMet = false
break break
} }
@@ -407,7 +407,7 @@ func (t *JobClassTagger) Match(job *schema.Job) {
for _, v := range ri.variables { for _, v := range ri.variables {
value, err := expr.Run(v.expr, env) value, err := expr.Run(v.expr, env)
if err != nil { if err != nil {
cclog.Errorf("error evaluating variable %s for rule %s: %#v", v.name, tag, err) cclog.Debugf("error evaluating variable %s for rule %s: %#v", v.name, tag, err)
varError = true varError = true
break break
} }