summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-08-11 15:07:16 +0300
committerPaul Buetow <paul@buetow.org>2024-08-11 15:07:16 +0300
commit5f34aa03f262837f6fb475490c3467880a1ea041 (patch)
tree3eb7a8b0898fa62a21c5022759f77baf39586209
parent8eba8522dc6fb9a558fa88d4f6abc45eeb1e58c9 (diff)
more on this
-rw-r--r--cmd/gosd/main.go2
-rw-r--r--internal/config/config_test.go2
-rw-r--r--internal/config/server/server.go10
-rw-r--r--internal/server/cron/cron.go4
4 files changed, 10 insertions, 8 deletions
diff --git a/cmd/gosd/main.go b/cmd/gosd/main.go
index e83d6f8..ded379c 100644
--- a/cmd/gosd/main.go
+++ b/cmd/gosd/main.go
@@ -29,7 +29,7 @@ func main() {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
- if err := cron.Start(ctx, conf); err != nil {
+ if err := cron.Start(ctx, conf, hand); err != nil {
panic(err)
}
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
}