Merge pull request #10 from CLIP-HPC/9-v101-runtime-error-invalid-mem…

…ory-address-or-nil-pointer-dereference fix: ignore sacct jobs with no jobid field
CLIP-HPC · Dec 22, 2022 · 3b8bab1 · 3b8bab1
2 parents 707f030 + 0f992d0
commit 3b8bab1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v1.0.0
+v1.0.2
diff --git a/internal/model/tabs/jobhisttab/jobhisttabtable.go b/internal/model/tabs/jobhisttab/jobhisttabtable.go
@@ -72,6 +72,14 @@ func (saList *SacctJSON) FilterSacctTable(f string, l *log.Logger) (*TableRows,
 
 	for _, v := range saList.Jobs {
 
+		// https://github.com/CLIP-HPC/SlurmCommander/issues/9
+		// Entry without JobId, log&discard
+		switch {
+		case v.JobId == nil:
+			l.Printf("FilterSacctTable: Found job with no JobId field, skipping...\n")
+			continue
+		}
+
 		line := strings.Join([]string{
 			strconv.Itoa(*v.JobId),
 			*v.Name,

diff --git a/internal/model/view.go b/internal/model/view.go
@@ -47,11 +47,12 @@ func (m Model) tabAbout() string {
 
 	s += `
 Petar Jager
-CLIP-HPC @VBC
 
-Contributors:
+A special thank you goes to:
+
 Seren Ümit
 Kilian Cavalotti
+Killian Murphy
 `
 
 	return s