From 5f34aa03f262837f6fb475490c3467880a1ea041 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 11 Aug 2024 15:07:16 +0300
Subject: more on this

---
 internal/config/config_test.go   |  2 +-
 internal/config/server/server.go | 10 +++++-----
 internal/server/cron/cron.go     |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'internal')

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 45008de..f22b336 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -55,7 +55,7 @@ func TestSecondENV(t *testing.T) {
 	if expected != got {
 		t.Errorf("got '%s' but expected '%s'", got, expected)
 	}
-}dfdf
+}
 
 func TestIsAllUpperCase(t *testing.T) {
 	if isAllUpperCase("foo_bar") {
diff --git a/internal/config/server/server.go b/internal/config/server/server.go
index 7e642d0..69bfae2 100644
--- a/internal/config/server/server.go
+++ b/internal/config/server/server.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"strconv"
 	"strings"
 
 	"codeberg.org/snonux/gos/internal/config"
@@ -42,11 +43,10 @@ func New(configFile string) (ServerConfig, error) {
 
 	// TODO: When there are more int parsing cases in the config, use generic? config.FromENV?
 	if conf.CRONMergeIntervalS == 0 {
-		fmt.Println("FOO", config.FromENV("GOS_CRON_MERGE_INTERVAL", "3600"))
-		// var err error
-		// if conf.CRONMergeIntervalS, err = strconv.Atoi(config.FromENV("GOS_CRON_MERGE_INTERVAL", "3600")); err != nil {
-		// 	return conf, err
-		// }
+		var err error
+		if conf.CRONMergeIntervalS, err = strconv.Atoi(config.FromENV("GOS_CRON_MERGE_INTERVAL", "3600")); err != nil {
+			return conf, err
+		}
 	}
 
 	return conf, nil
diff --git a/internal/server/cron/cron.go b/internal/server/cron/cron.go
index 6e1c5fa..bdf7fae 100644
--- a/internal/server/cron/cron.go
+++ b/internal/server/cron/cron.go
@@ -6,9 +6,10 @@ import (
 	"time"
 
 	config "codeberg.org/snonux/gos/internal/config/server"
+	"codeberg.org/snonux/gos/internal/server/handler"
 )
 
-func Start(ctx context.Context, conf config.ServerConfig) error {
+func Start(ctx context.Context, conf config.ServerConfig, hand handler.Handler) error {
 	go func() {
 		helloTicker := time.NewTicker(10 * time.Second)
 		mergeTicker := time.NewTicker(time.Duration(conf.CRONMergeIntervalS) * time.Second)
@@ -24,5 +25,6 @@ func Start(ctx context.Context, conf config.ServerConfig) error {
 			}
 		}
 	}()
+
 	return nil
 }
-- 
cgit v1.2.3