ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-01 11:13:50 +02:00
Code Issues Packages Releases Activity

Refine app detection

Browse Source 
Switch to regexp
This commit is contained in:
Jan Eitzinger 2025-06-27 14:11:10 +02:00
parent 983aa592d8
commit 7531ba4b5c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/repository/tags.go
View File

@ -152,13 +152,13 @@ func (r *JobRepository) removeTagFromArchiveJobs(jobIds []int64) {
for _, j := range jobIds { for _, j := range jobIds {
tags, err := r.getArchiveTags(&j) tags, err := r.getArchiveTags(&j)
if err != nil { if err != nil {
log.Warn("Error while getting tags for job") log.Warnf("Error while getting tags for job %d", j)
continue continue
} }
job, err := r.FindByIdDirect(j) job, err := r.FindByIdDirect(j)
if err != nil { if err != nil {
log.Warn("Error while getting job") log.Warnf("Error while getting job %d", j)
continue continue
} }

3
internal/tagger/apps/qe.txt
View File

@ -1,3 +0,0 @@
pw
neb
ph

2
internal/tagger/apps/starccm.txt Normal file
View File

@ -0,0 +1,2 @@
starccm+
-podkey

4
internal/tagger/detectApp.go
View File

@ -11,6 +11,7 @@ import (
"io/fs" "io/fs"
"os" "os"
"path/filepath" "path/filepath"
"regexp"
"strings" "strings"
"github.com/ClusterCockpit/cc-backend/internal/repository" "github.com/ClusterCockpit/cc-backend/internal/repository"
@ -111,7 +112,8 @@ func (t *AppTagger) Match(job *schema.Job) {
for _, a := range t.apps { for _, a := range t.apps {
tag := a.tag tag := a.tag
for _, s := range a.strings { for _, s := range a.strings {
if strings.Contains(strings.ToLower(jobscript), fmt.Sprintf(" %s ", s)) { matched, _ := regexp.MatchString(s, strings.ToLower(jobscript))
if matched {
if !r.HasTag(id, t.tagType, tag) { if !r.HasTag(id, t.tagType, tag) {
r.AddTagOrCreateDirect(id, t.tagType, tag) r.AddTagOrCreateDirect(id, t.tagType, tag)
break out break out