style: Minor styling improvements

Signed-off-by: Mahendra Paipuri <[email protected]>
mahendrapaipuri · Dec 24, 2023 · 710c135 · 710c135
1 parent d548420
commit 710c135
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/pkg/collector/ipmi.go b/pkg/collector/ipmi.go
@@ -49,18 +49,18 @@ var (
 )
 
 func init() {
-	registerCollector(ipmiCollectorSubsystem, defaultEnabled, NewIpmiCollector)
+	registerCollector(ipmiCollectorSubsystem, defaultEnabled, NewIPMICollector)
 }
 
-// NewIpmiCollector returns a new Collector exposing IMPI DCMI power metrics.
-func NewIpmiCollector(logger log.Logger) (Collector, error) {
+// NewIPMICollector returns a new Collector exposing IMPI DCMI power metrics.
+func NewIPMICollector(logger log.Logger) (Collector, error) {
 
 	wattsMetricDesc := prometheus.NewDesc(
 		prometheus.BuildFQName(namespace, ipmiCollectorSubsystem, "watts_total"),
 		"Current Power consumption in watts", []string{}, nil,
 	)
 
-	var execMode string = ""
+	var execMode string
 
 	// Split command
 	cmdSlice := strings.Split(*ipmiDcmiCmd, " ")

diff --git a/pkg/jobstats/db.go b/pkg/jobstats/db.go
@@ -40,7 +40,8 @@ func writeTimeStampToFile(filePath string, timeStamp time.Time, logger log.Logge
 	timeStampByte := []byte(timeStampString)
 	err := os.WriteFile(filePath, timeStampByte, 0644)
 	if err != nil {
-		level.Error(logger).Log("msg", "Failed to write timestamp to file", "time", timeStampString, "file", filePath, "err", err)
+		level.Error(logger).
+			Log("msg", "Failed to write timestamp to file", "time", timeStampString, "file", filePath, "err", err)
 	}
 }
 
@@ -280,16 +281,19 @@ func (j *jobStatsDB) Collect() error {
 	if currentTime.Sub(j.lastJobsUpdateTime) < time.Duration(24*time.Hour) {
 		return j.getJobStats(j.lastJobsUpdateTime, currentTime)
 	}
-	level.Info(j.logger).Log("msg", "DB update duration is more than 1 day. Doing incremental update. This may take a while...")
+	level.Info(j.logger).
+		Log("msg", "DB update duration is more than 1 day. Doing incremental update. This may take a while...")
 
 	// If duration is more than 1 day, do update for each day
 	var nextUpdateTime time.Time
 	for {
 		nextUpdateTime = j.lastJobsUpdateTime.Add(24 * time.Hour)
 		if nextUpdateTime.Compare(currentTime) == -1 {
-			level.Debug(j.logger).Log("msg", "Incremental DB update step", "from", j.lastJobsUpdateTime, "to", nextUpdateTime)
+			level.Debug(j.logger).
+				Log("msg", "Incremental DB update step", "from", j.lastJobsUpdateTime, "to", nextUpdateTime)
 			if err := j.getJobStats(j.lastJobsUpdateTime, nextUpdateTime); err != nil {
-				level.Error(j.logger).Log("msg", "Failed incremental update", "from", j.lastJobsUpdateTime, "to", nextUpdateTime, "err", err)
+				level.Error(j.logger).
+					Log("msg", "Failed incremental update", "from", j.lastJobsUpdateTime, "to", nextUpdateTime, "err", err)
 				return err
 			}
 		} else {

diff --git a/pkg/jobstats/db_test.go b/pkg/jobstats/db_test.go
@@ -162,7 +162,12 @@ func TestNewJobStatsDB(t *testing.T) {
 
 	// Check content of last update time file. It should change
 	if timeString, err := os.ReadFile(lastJobsUpdateTimeFile); string(timeString) != "2023-12-21T00:00:00" {
-		t.Errorf("Last update time string test failed. Expected %s got %s %s", "2023-12-21T00:00:00", string(timeString), err)
+		t.Errorf(
+			"Last update time string test failed. Expected %s got %s %s",
+			"2023-12-21T00:00:00",
+			string(timeString),
+			err,
+		)
 	}
 
 	// Remove last update time file
@@ -187,7 +192,12 @@ func TestNewJobStatsDB(t *testing.T) {
 
 	// Check content of last update time file. It should change
 	if timeString, err := os.ReadFile(lastJobsUpdateTimeFile); string(timeString) != "2023-12-22T00:00:00" {
-		t.Errorf("Last update time string test failed. Expected %s got %s %s", "2023-12-22T00:00:00", string(timeString), err)
+		t.Errorf(
+			"Last update time string test failed. Expected %s got %s %s",
+			"2023-12-22T00:00:00",
+			string(timeString),
+			err,
+		)
 	}
 }
 

diff --git a/pkg/jobstats/slurm.go b/pkg/jobstats/slurm.go
@@ -173,7 +173,8 @@ func slurmChecks(logger log.Logger) error {
 
 	// If current user is slurm or root pass checks
 	if currentUser, err := user.Current(); err == nil && (currentUser.Username == "slurm" || currentUser.Uid == "0") {
-		level.Debug(logger).Log("msg", "Current user have enough privileges to get job data for all users", "user", currentUser.Username)
+		level.Debug(logger).
+			Log("msg", "Current user have enough privileges to get job data for all users", "user", currentUser.Username)
 		return nil
 	}