From 187f6d9fd5ea86ca19ad44385bc04f95298c9994 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Sat, 26 Feb 2022 15:43:15 -0800
Subject: [PATCH] Fix logger setup
---
glrdomon.go | 8 +++-----
glrdomon_test.go | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/glrdomon.go b/glrdomon.go
index 51b77a9..1fb284d 100644
--- a/glrdomon.go
+++ b/glrdomon.go
@@ -30,8 +30,7 @@ type tokenSource struct {
var (
configPath string
- logger *log.Logger
- logDest string
+ logger *log.Logger
apiKey string
threshold int
@@ -64,8 +63,7 @@ func initConfig() {
threshold = cfg.Threshold
deleteStale = cfg.DeleteStale
- logDest = cfg.LogDest
- setUpLogger()
+ setUpLogger(cfg.LogDest)
logger.Printf("Starting GitLab Runner monitoring with config %s", configPath)
@@ -194,7 +192,7 @@ func deleteDroplet(droplet godo.Droplet) bool {
return err == nil
}
-func setUpLogger() {
+func setUpLogger(logDest string) {
logOpts := log.Ldate | log.Ltime | log.LUTC | log.Lshortfile
if logDest == "os.Stdout" {
diff --git a/glrdomon_test.go b/glrdomon_test.go
index 3604ed9..35ffc0a 100644
--- a/glrdomon_test.go
+++ b/glrdomon_test.go
@@ -8,7 +8,7 @@ import (
)
func TestCheckDropletAge(t *testing.T) {
- setUpLogger()
+ setUpLogger("os.stdOut")
staleDroplet := godo.Droplet{
ID: 1234,
--
GitLab