getting closer

internal/config/config.go

@@ -79,5 +79,10 @@ func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
 		log:             log,
 	}
 
+	if s.Debug {
+		params.Logger.EnableDebugLogging()
+		s.log = params.Logger.Get()
+	}
+
 	return s, nil
 }

internal/database/database.go

@@ -31,18 +31,21 @@ type Database struct {
 }
 
 func New(lc fx.Lifecycle, params DatabaseParams) (*Database, error) {
-	s.log.Info().Msg("Database instantiated")
 	s := new(Database)
 	s.params = params
 	s.log = params.Logger.Get()
 
+	s.log.Info().Msg("Database instantiated")
+
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			s.log.Info().Msg("Database OnStart Hook")
 			// FIXME connect to db
+			return nil
 		},
 		OnStop: func(ctx context.Context) error {
 			// FIXME disconnect from db
+			return nil
 		},
 	})
 	return s, nil

internal/handlers/handlers.go

@@ -4,17 +4,17 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
-	"time"
 
+	"git.eeqj.de/sneak/gohttpserver/internal/database"
 	"git.eeqj.de/sneak/gohttpserver/internal/globals"
+	"git.eeqj.de/sneak/gohttpserver/internal/logger"
 	"github.com/rs/zerolog"
 	"go.uber.org/fx"
-	"google.golang.org/genproto/googleapis/spanner/admin/database/v1"
 )
 
 type HandlersParams struct {
 	fx.In
-	Logger   *zerolog.Logger
+	Logger   logger.Logger
 	Globals  globals.Globals
 	Database database.Database
 }
@@ -31,20 +31,12 @@ func New(lc fx.Lifecycle, params HandlersParams) (*Handlers, error) {
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			// FIXME compile some templates here or something
+			return nil
 		},
 	})
 	return s, nil
 }
 
-func (s *Handlers) HandleNow() http.HandlerFunc {
-	type response struct {
-		Now time.Time `json:"now"`
-	}
-	return func(w http.ResponseWriter, r *http.Request) {
-		s.respondJSON(w, r, &response{Now: time.Now()}, 200)
-	}
-}
-
 func (s *Handlers) respondJSON(w http.ResponseWriter, r *http.Request, data interface{}, status int) {
 	w.WriteHeader(status)
 	w.Header().Set("Content-Type", "application/json")

internal/logger/logger.go

@@ -1,4 +1,4 @@
-package server
+package logger
 
 import (
 	"io"
@@ -8,13 +8,11 @@ import (
 	"git.eeqj.de/sneak/gohttpserver/internal/globals"
 	"github.com/rs/zerolog"
 	"go.uber.org/fx"
-	"honnef.co/go/tools/config"
 )
 
 type LoggerParams struct {
 	fx.In
 	Globals globals.Globals
-	Config  config.Config
 }
 
 type Logger struct {
@@ -78,14 +76,14 @@ func New(lc fx.Lifecycle, params LoggerParams) (*Logger, error) {
 	l.log = &logger
 	// log.Logger = logger
 
-	if l.params.Config.Debug {
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		l.log.Debug().Bool("debug", true).Send()
-	}
-
 	return l, nil
 }
 
+func (l *Logger) EnableDebugLogging() {
+	zerolog.SetGlobalLevel(zerolog.DebugLevel)
+	l.log.Debug().Bool("debug", true).Send()
+}
+
 func (l *Logger) Get() *zerolog.Logger {
 	return l.log
 }

internal/server/server.go

@@ -3,19 +3,19 @@ package server
 import (
 	"context"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
+	"git.eeqj.de/sneak/gohttpserver/internal/config"
 	"git.eeqj.de/sneak/gohttpserver/internal/globals"
-	"github.com/docker/docker/daemon/logger"
+	"git.eeqj.de/sneak/gohttpserver/internal/logger"
 	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
 	"go.uber.org/fx"
-	"honnef.co/go/tools/config"
 
 	"github.com/getsentry/sentry-go"
 	"github.com/go-chi/chi"