ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-22 20:41:40 +02:00
Code Issues Packages Releases Activity

Merge branch 'master' into 97_107_mark_and_show_shared

Browse Source 
- Solves query.go conflict by splitting QueryJobLinks function aswell
This commit is contained in:
Christoph Kluge
2023-06-01 17:48:43 +02:00
parent 37d5db443f 08a7df461e
commit a6cb833843
16 changed files with 290 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/log/log.go
View File

@@ -44,6 +44,7 @@ var (
/* CONFIG */
func Init(lvl string, logdate bool) {
switch lvl {
case "crit":
ErrWriter = io.Discard
@@ -70,6 +71,12 @@ func Init(lvl string, logdate bool) {
WarnLog = log.New(WarnWriter, WarnPrefix, log.Lshortfile)
ErrLog = log.New(ErrWriter, ErrPrefix, log.Llongfile)
CritLog = log.New(CritWriter, CritPrefix, log.Llongfile)
} else {
DebugLog = log.New(DebugWriter, DebugPrefix, log.LstdFlags)
InfoLog = log.New(InfoWriter, InfoPrefix, log.LstdFlags|log.Lshortfile)
WarnLog = log.New(WarnWriter, WarnPrefix, log.LstdFlags|log.Lshortfile)
ErrLog = log.New(ErrWriter, ErrPrefix, log.LstdFlags|log.Llongfile)
CritLog = log.New(CritWriter, CritPrefix, log.LstdFlags|log.Llongfile)
}
}

7
pkg/schema/cluster.go
View File

@@ -162,10 +162,13 @@ func (topo *Topology) GetMemoryDomainsFromHWThreads(
// Temporary fix to convert back from int id to string id for accelerators
func (topo *Topology) GetAcceleratorID(id int) (string, error) {
if id < len(topo.Accelerators) {
if id < 0 {
fmt.Printf("ID smaller than 0!\n")
return topo.Accelerators[0].ID, nil
} else if id < len(topo.Accelerators) {
return topo.Accelerators[id].ID, nil
} else {
return "", fmt.Errorf("Index %d out of range", id)
return "", fmt.Errorf("index %d out of range", id)
}
}