Port to cc-lib. Extend legal header.

internal/taskManager/commitJobService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -9,7 +9,7 @@ import (
 
 	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/repository"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
@@ -21,15 +21,15 @@ func RegisterCommitJobService() {
 		frequency = "2m"
 	}
 	d, _ := time.ParseDuration(frequency)
-	log.Infof("Register commitJob service with %s interval", frequency)
+	cclog.Infof("Register commitJob service with %s interval", frequency)
 
 	s.NewJob(gocron.DurationJob(d),
 		gocron.NewTask(
 			func() {
 				start := time.Now()
-				log.Printf("Jobcache sync started at %s", start.Format(time.RFC3339))
+				cclog.Printf("Jobcache sync started at %s", start.Format(time.RFC3339))
 				jobs, _ := jobRepo.SyncJobs()
 				repository.CallJobStartHooks(jobs)
-				log.Printf("Jobcache sync and job callbacks are done and took %s", time.Since(start))
+				cclog.Printf("Jobcache sync and job callbacks are done and took %s", time.Since(start))
 			}))
 }

internal/taskManager/compressionService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -8,13 +8,13 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
+	"github.com/ClusterCockpit/cc-lib/schema"
 	"github.com/go-co-op/gocron/v2"
 )
 
 func RegisterCompressionService(compressOlderThan int) {
-	log.Info("Register compression service")
+	cclog.Info("Register compression service")
 
 	s.NewJob(gocron.DailyJob(1, gocron.NewAtTimes(gocron.NewAtTime(05, 0, 0))),
 		gocron.NewTask(
@@ -26,7 +26,7 @@ func RegisterCompressionService(compressOlderThan int) {
 				startTime := time.Now().Unix() - int64(compressOlderThan*24*3600)
 				lastTime := ar.CompressLast(startTime)
 				if startTime == lastTime {
-					log.Info("Compression Service - Complete archive run")
+					cclog.Info("Compression Service - Complete archive run")
 					jobs, err = jobRepo.FindJobsBetween(0, startTime)
 
 				} else {
@@ -34,7 +34,7 @@ func RegisterCompressionService(compressOlderThan int) {
 				}
 
 				if err != nil {
-					log.Warnf("Error while looking for compression jobs: %v", err)
+					cclog.Warnf("Error while looking for compression jobs: %v", err)
 				}
 				ar.Compress(jobs)
 			}))

internal/taskManager/ldapSyncService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -8,29 +8,29 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/internal/auth"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
 func RegisterLdapSyncService(ds string) {
 	interval, err := parseDuration(ds)
 	if err != nil {
-		log.Warnf("Could not parse duration for sync interval: %v",
+		cclog.Warnf("Could not parse duration for sync interval: %v",
 			ds)
 		return
 	}
 
 	auth := auth.GetAuthInstance()
 
-	log.Info("Register LDAP sync service")
+	cclog.Info("Register LDAP sync service")
 	s.NewJob(gocron.DurationJob(interval),
 		gocron.NewTask(
 			func() {
 				t := time.Now()
-				log.Printf("ldap sync started at %s", t.Format(time.RFC3339))
+				cclog.Printf("ldap sync started at %s", t.Format(time.RFC3339))
 				if err := auth.LdapAuth.Sync(); err != nil {
-					log.Errorf("ldap sync failed: %s", err.Error())
+					cclog.Errorf("ldap sync failed: %s", err.Error())
 				}
-				log.Print("ldap sync done")
+				cclog.Print("ldap sync done")
 			}))
 }

internal/taskManager/retentionService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
 func RegisterRetentionDeleteService(age int, includeDB bool) {
-	log.Info("Register retention delete service")
+	cclog.Info("Register retention delete service")
 
 	s.NewJob(gocron.DailyJob(1, gocron.NewAtTimes(gocron.NewAtTime(04, 0, 0))),
 		gocron.NewTask(
@@ -21,26 +21,26 @@ func RegisterRetentionDeleteService(age int, includeDB bool) {
 				startTime := time.Now().Unix() - int64(age*24*3600)
 				jobs, err := jobRepo.FindJobsBetween(0, startTime)
 				if err != nil {
-					log.Warnf("Error while looking for retention jobs: %s", err.Error())
+					cclog.Warnf("Error while looking for retention jobs: %s", err.Error())
 				}
 				archive.GetHandle().CleanUp(jobs)
 
 				if includeDB {
 					cnt, err := jobRepo.DeleteJobsBefore(startTime)
 					if err != nil {
-						log.Errorf("Error while deleting retention jobs from db: %s", err.Error())
+						cclog.Errorf("Error while deleting retention jobs from db: %s", err.Error())
 					} else {
-						log.Infof("Retention: Removed %d jobs from db", cnt)
+						cclog.Infof("Retention: Removed %d jobs from db", cnt)
 					}
 					if err = jobRepo.Optimize(); err != nil {
-						log.Errorf("Error occured in db optimization: %s", err.Error())
+						cclog.Errorf("Error occured in db optimization: %s", err.Error())
 					}
 				}
 			}))
 }
 
 func RegisterRetentionMoveService(age int, includeDB bool, location string) {
-	log.Info("Register retention move service")
+	cclog.Info("Register retention move service")
 
 	s.NewJob(gocron.DailyJob(1, gocron.NewAtTimes(gocron.NewAtTime(04, 0, 0))),
 		gocron.NewTask(
@@ -48,19 +48,19 @@ func RegisterRetentionMoveService(age int, includeDB bool, location string) {
 				startTime := time.Now().Unix() - int64(age*24*3600)
 				jobs, err := jobRepo.FindJobsBetween(0, startTime)
 				if err != nil {
-					log.Warnf("Error while looking for retention jobs: %s", err.Error())
+					cclog.Warnf("Error while looking for retention jobs: %s", err.Error())
 				}
 				archive.GetHandle().Move(jobs, location)
 
 				if includeDB {
 					cnt, err := jobRepo.DeleteJobsBefore(startTime)
 					if err != nil {
-						log.Errorf("Error while deleting retention jobs from db: %v", err)
+						cclog.Errorf("Error while deleting retention jobs from db: %v", err)
 					} else {
-						log.Infof("Retention: Removed %d jobs from db", cnt)
+						cclog.Infof("Retention: Removed %d jobs from db", cnt)
 					}
 					if err = jobRepo.Optimize(); err != nil {
-						log.Errorf("Error occured in db optimization: %v", err)
+						cclog.Errorf("Error occured in db optimization: %v", err)
 					}
 				}
 			}))

internal/taskManager/stopJobsExceedTime.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -8,19 +8,19 @@ import (
 	"runtime"
 
 	"github.com/ClusterCockpit/cc-backend/internal/config"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
 func RegisterStopJobsExceedTime() {
-	log.Info("Register undead jobs service")
+	cclog.Info("Register undead jobs service")
 
 	s.NewJob(gocron.DailyJob(1, gocron.NewAtTimes(gocron.NewAtTime(03, 0, 0))),
 		gocron.NewTask(
 			func() {
 				err := jobRepo.StopJobsExceedingWalltimeBy(config.Keys.StopJobsExceedingWalltime)
 				if err != nil {
-					log.Warnf("Error while looking for jobs exceeding their walltime: %s", err.Error())
+					cclog.Warnf("Error while looking for jobs exceeding their walltime: %s", err.Error())
 				}
 				runtime.GC()
 			}))

internal/taskManager/taskManager.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -10,8 +10,8 @@ import (
 
 	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/repository"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
+	"github.com/ClusterCockpit/cc-lib/schema"
 	"github.com/go-co-op/gocron/v2"
 )
 
@@ -23,13 +23,13 @@ var (
 func parseDuration(s string) (time.Duration, error) {
 	interval, err := time.ParseDuration(s)
 	if err != nil {
-		log.Warnf("Could not parse duration for sync interval: %v",
+		cclog.Warnf("Could not parse duration for sync interval: %v",
 			s)
 		return 0, err
 	}
 
 	if interval == 0 {
-		log.Info("TaskManager: Sync interval is zero")
+		cclog.Info("TaskManager: Sync interval is zero")
 	}
 
 	return interval, nil
@@ -40,7 +40,7 @@ func Start() {
 	jobRepo = repository.GetJobRepository()
 	s, err = gocron.NewScheduler()
 	if err != nil {
-		log.Abortf("Taskmanager Start: Could not create gocron scheduler.\nError: %s\n", err.Error())
+		cclog.Abortf("Taskmanager Start: Could not create gocron scheduler.\nError: %s\n", err.Error())
 	}
 
 	if config.Keys.StopJobsExceedingWalltime > 0 {
@@ -54,7 +54,7 @@ func Start() {
 	cfg.Retention.IncludeDB = true
 
 	if err := json.Unmarshal(config.Keys.Archive, &cfg); err != nil {
-		log.Warn("Error while unmarshaling raw config json")
+		cclog.Warn("Error while unmarshaling raw config json")
 	}
 
 	switch cfg.Retention.Policy {

internal/taskManager/updateDurationService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/ClusterCockpit/cc-backend/internal/config"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
 	"github.com/go-co-op/gocron/v2"
 )
 
@@ -20,14 +20,14 @@ func RegisterUpdateDurationWorker() {
 		frequency = "5m"
 	}
 	d, _ := time.ParseDuration(frequency)
-	log.Infof("Register Duration Update service with %s interval", frequency)
+	cclog.Infof("Register Duration Update service with %s interval", frequency)
 
 	s.NewJob(gocron.DurationJob(d),
 		gocron.NewTask(
 			func() {
 				start := time.Now()
-				log.Printf("Update duration started at %s", start.Format(time.RFC3339))
+				cclog.Printf("Update duration started at %s", start.Format(time.RFC3339))
 				jobRepo.UpdateDuration()
-				log.Printf("Update duration is done and took %s", time.Since(start))
+				cclog.Printf("Update duration is done and took %s", time.Since(start))
 			}))
 }

internal/taskManager/updateFootprintService.go

@@ -1,5 +1,5 @@
 // Copyright (C) NHR@FAU, University Erlangen-Nuremberg.
-// All rights reserved.
+// All rights reserved. This file is part of cc-backend.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 package taskManager
@@ -12,8 +12,8 @@ import (
 	"github.com/ClusterCockpit/cc-backend/internal/config"
 	"github.com/ClusterCockpit/cc-backend/internal/metricdata"
 	"github.com/ClusterCockpit/cc-backend/pkg/archive"
-	"github.com/ClusterCockpit/cc-backend/pkg/log"
-	"github.com/ClusterCockpit/cc-backend/pkg/schema"
+	cclog "github.com/ClusterCockpit/cc-lib/ccLogger"
+	"github.com/ClusterCockpit/cc-lib/schema"
 	sq "github.com/Masterminds/squirrel"
 	"github.com/go-co-op/gocron/v2"
 )
@@ -26,7 +26,7 @@ func RegisterFootprintWorker() {
 		frequency = "10m"
 	}
 	d, _ := time.ParseDuration(frequency)
-	log.Infof("Register Footprint Update service with %s interval", frequency)
+	cclog.Infof("Register Footprint Update service with %s interval", frequency)
 
 	s.NewJob(gocron.DurationJob(d),
 		gocron.NewTask(
@@ -35,7 +35,7 @@ func RegisterFootprintWorker() {
 				c := 0
 				ce := 0
 				cl := 0
-				log.Printf("Update Footprints started at %s", s.Format(time.RFC3339))
+				cclog.Printf("Update Footprints started at %s", s.Format(time.RFC3339))
 
 				for _, cluster := range archive.Clusters {
 					s_cluster := time.Now()
@@ -54,21 +54,21 @@ func RegisterFootprintWorker() {
 
 					repo, err := metricdata.GetMetricDataRepo(cluster.Name)
 					if err != nil {
-						log.Errorf("no metric data repository configured for '%s'", cluster.Name)
+						cclog.Errorf("no metric data repository configured for '%s'", cluster.Name)
 						continue
 					}
 
 					pendingStatements := []sq.UpdateBuilder{}
 
 					for _, job := range jobs {
-						log.Debugf("Prepare job %d", job.JobID)
+						cclog.Debugf("Prepare job %d", job.JobID)
 						cl++
 
 						s_job := time.Now()
 
 						jobStats, err := repo.LoadStats(job, allMetrics, context.Background())
 						if err != nil {
-							log.Errorf("error wile loading job data stats for footprint update: %v", err)
+							cclog.Errorf("error wile loading job data stats for footprint update: %v", err)
 							ce++
 							continue
 						}
@@ -106,26 +106,26 @@ func RegisterFootprintWorker() {
 						stmt := sq.Update("job")
 						stmt, err = jobRepo.UpdateFootprint(stmt, job)
 						if err != nil {
-							log.Errorf("update job (dbid: %d) statement build failed at footprint step: %s", job.ID, err.Error())
+							cclog.Errorf("update job (dbid: %d) statement build failed at footprint step: %s", job.ID, err.Error())
 							ce++
 							continue
 						}
 						stmt = stmt.Where("job.id = ?", job.ID)
 
 						pendingStatements = append(pendingStatements, stmt)
-						log.Debugf("Job %d took %s", job.JobID, time.Since(s_job))
+						cclog.Debugf("Job %d took %s", job.JobID, time.Since(s_job))
 					}
 
 					t, err := jobRepo.TransactionInit()
 					if err != nil {
-						log.Errorf("failed TransactionInit %v", err)
-						log.Errorf("skipped %d transactions for cluster %s", len(pendingStatements), cluster.Name)
+						cclog.Errorf("failed TransactionInit %v", err)
+						cclog.Errorf("skipped %d transactions for cluster %s", len(pendingStatements), cluster.Name)
 						ce += len(pendingStatements)
 					} else {
 						for _, ps := range pendingStatements {
 							query, args, err := ps.ToSql()
 							if err != nil {
-								log.Errorf("failed in ToSQL conversion: %v", err)
+								cclog.Errorf("failed in ToSQL conversion: %v", err)
 								ce++
 							} else {
 								// args...: Footprint-JSON, Energyfootprint-JSON, TotalEnergy, JobID
@@ -135,8 +135,8 @@ func RegisterFootprintWorker() {
 						}
 						jobRepo.TransactionEnd(t)
 					}
-					log.Debugf("Finish Cluster %s, took %s", cluster.Name, time.Since(s_cluster))
+					cclog.Debugf("Finish Cluster %s, took %s", cluster.Name, time.Since(s_cluster))
 				}
-				log.Printf("Updating %d (of %d; Skipped %d) Footprints is done and took %s", c, cl, ce, time.Since(s))
+				cclog.Printf("Updating %d (of %d; Skipped %d) Footprints is done and took %s", c, cl, ce, time.Since(s))
 			}))
 }