From 2141e412413149cc9fca1780ae2089f857c6c116 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 14 Jun 2023 19:20:16 +0200
Subject: [PATCH] work in progress: logging

---
 lib/context/appcontext.go |  2 ++
 lib/system/system.go      |  9 +++++++++
 logging/log/log.go        |  2 +-
 logging/logging.go        | 20 ++++++++++++++++++--
 testing/testing.go        |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 lib/system/system.go

diff --git a/lib/context/appcontext.go b/lib/context/appcontext.go
index 719999d..3750aab 100644
--- a/lib/context/appcontext.go
+++ b/lib/context/appcontext.go
@@ -4,11 +4,13 @@ import (
 	"sync"
 
 	"git.sr.ht/~cco/go-scopes/lib"
+	"git.sr.ht/~cco/go-scopes/logging"
 )
 
 type appContext struct {
 	*context
 	services  Services
+	logger    *logging.Logger
 	waitgroup *sync.WaitGroup
 	doneCh    chan struct{}
 }
diff --git a/lib/system/system.go b/lib/system/system.go
new file mode 100644
index 0000000..922d397
--- /dev/null
+++ b/lib/system/system.go
@@ -0,0 +1,9 @@
+package system
+
+import "git.sr.ht/~cco/go-scopes/lib"
+
+func RemoveFile(ctx lib.Context, fpath string) {
+}
+
+func RemoveFiles(ctx lib.Context, path, pattern string) {
+}
diff --git a/logging/log/log.go b/logging/log/log.go
index 7ab1f4c..d992d1f 100644
--- a/logging/log/log.go
+++ b/logging/log/log.go
@@ -2,4 +2,4 @@ package log
 
 import "git.sr.ht/~cco/go-scopes/logging"
 
-var Info = logging.Logger.Info
+var Info = logging.GetLogger(nil).Info
diff --git a/logging/logging.go b/logging/logging.go
index eb6de12..56988c3 100644
--- a/logging/logging.go
+++ b/logging/logging.go
@@ -3,17 +3,33 @@ package logging
 import (
 	"fmt"
 
+	"git.sr.ht/~cco/go-scopes/lib"
+	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 )
 
-var Logger = log.Logger
+type Logger = zerolog.Logger
+
+var globalLogger Logger = log.Logger
 
 type Config struct {
 	Logfile string
+	Level   zerolog.Level
 }
 
-func Setup(cfg *Config, home string) {
+func Setup(ctx lib.Context, cfg *Config, home string) {
 	if cfg != nil {
 		fmt.Println("logging:", home, cfg.Logfile)
 	}
 }
+
+func New(cfg *Config, home string) *Logger {
+	return nil
+}
+
+func GetLogger(ctx lib.Context) *zerolog.Logger {
+	if ctx == nil {
+		return &globalLogger
+	}
+	return nil
+}
diff --git a/testing/testing.go b/testing/testing.go
index e57e7ed..b209d75 100644
--- a/testing/testing.go
+++ b/testing/testing.go
@@ -41,9 +41,9 @@ func SetUp(tbase *testing.T) *T {
 
 func SetUpApp(tbase *testing.T, cfg lib.Config) *T {
 	appCfg := cfg.(*app.Cfg)
-	logging.Setup(appCfg.Logging, appCfg.Home)
 	t := SetUp(tbase)
 	t.Ctx = context.AppContext(cfg).WithState(t)
+	logging.Setup(t.Ctx, appCfg.Logging, appCfg.Home)
 	cfg.Starter()(t.Ctx)
 	time.Sleep(100 * time.Millisecond)
 	return t