update logger and server

sublinks · Jan 23, 2024 · 64bee7b · 64bee7b
1 parent 5b2259a
commit 64bee7b
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 37 deletions.
diff --git a/cmd/federation.go b/cmd/federation.go
@@ -21,12 +21,12 @@ func main() {
 	}
 
 	conn, err := db.Connect()
+	defer conn.Close()
 	if err != nil {
 		logger.Fatal("failed connecting to db", err)
 	}
 	db.RunMigrations(conn)
 
-	defer conn.Close()
 	s := http.NewServer(logger)
 	s.RunServer()
 

diff --git a/internal/http/activity.go b/internal/http/activity.go
@@ -15,7 +15,7 @@ import (
 )
 
 func (s Server) SetupActivityRoutes() {
-	s.HandleFunc("/activities/{action}/{id}", s.getActivityHandler).Methods("GET")
+	s.Router.HandleFunc("/activities/{action}/{id}", s.getActivityHandler).Methods("GET")
 }
 
 func (s Server) getActivityHandler(w http.ResponseWriter, r *http.Request) {
@@ -25,7 +25,7 @@ func (s Server) getActivityHandler(w http.ResponseWriter, r *http.Request) {
 	case "create":
 		obj, err := s.GetPostActivityObject(vars["id"])
 		if err != nil {
-			s.Error("Error reading object", err)
+			s.Logger.Error("Error reading object", err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
@@ -57,7 +57,7 @@ func (s Server) GetPostActivityObject(id string) (*activitypub.Post, error) {
 	c := lemmy.GetLemmyClient(ctx)
 	post, err := c.GetPost(ctx, id)
 	if err != nil {
-		s.Error("Error reading post", err)
+		s.Logger.Error("Error reading post", err)
 		return nil, err
 	}
 	return activitypub.ConvertPostToApub(post), nil

diff --git a/internal/http/apub.go b/internal/http/apub.go
@@ -5,28 +5,28 @@ import (
 )
 
 func (s Server) SetupApubRoutes() {
-	s.HandleFunc("/users/{user}/inbox", getInboxHandler).Methods("GET")
-	s.HandleFunc("/users/{user}/inbox", postInboxHandler).Methods("POST")
-	s.HandleFunc("/users/{user}/outbox", getOutboxHandler).Methods("GET")
-	s.HandleFunc("/users/{user}/outbox", postOutboxHandler).Methods("POST")
+	s.Router.HandleFunc("/users/{user}/inbox", s.getInboxHandler).Methods("GET")
+	s.Router.HandleFunc("/users/{user}/inbox", s.postInboxHandler).Methods("POST")
+	s.Router.HandleFunc("/users/{user}/outbox", s.getOutboxHandler).Methods("GET")
+	s.Router.HandleFunc("/users/{user}/outbox", s.postOutboxHandler).Methods("POST")
 }
 
-func getInboxHandler(w http.ResponseWriter, r *http.Request) {
+func (s Server) getInboxHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Header().Add("content-type", "application/activity+json")
 }
 
-func postInboxHandler(w http.ResponseWriter, r *http.Request) {
+func (s Server) postInboxHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Header().Add("content-type", "application/activity+json")
 }
 
-func getOutboxHandler(w http.ResponseWriter, r *http.Request) {
+func (s Server) getOutboxHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Header().Add("content-type", "application/activity+json")
 }
 
-func postOutboxHandler(w http.ResponseWriter, r *http.Request) {
+func (s Server) postOutboxHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Header().Add("content-type", "application/activity+json")
 }
diff --git a/internal/http/post.go b/internal/http/post.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (s Server) SetupPostRoutes() {
-	s.HandleFunc("/post/{postId}", s.getPostHandler).Methods("GET")
+	s.Router.HandleFunc("/post/{postId}", s.getPostHandler).Methods("GET")
 }
 
 func (s Server) getPostHandler(w http.ResponseWriter, r *http.Request) {
@@ -19,7 +19,7 @@ func (s Server) getPostHandler(w http.ResponseWriter, r *http.Request) {
 	c := lemmy.GetLemmyClient(ctx)
 	post, err := c.GetPost(ctx, vars["postId"])
 	if err != nil {
-		s.Error("Error reading post", err)
+		s.Logger.Error("Error reading post", err)
 		return
 	}
 	postLd := activitypub.ConvertPostToApub(post)

diff --git a/internal/http/server.go b/internal/http/server.go
@@ -50,9 +50,9 @@ func (s Server) RunServer() {
 
 	// Run our server in a goroutine so that it doesn't block.
 	go func() {
-		s.Info("Starting server")
+		s.Logger.Info("Starting server")
 		if err := srv.ListenAndServe(); err != nil {
-			s.Error("Error starting server", err)
+			s.Logger.Error("Error starting server", err)
 		}
 	}()
 
@@ -73,5 +73,5 @@ func (s Server) RunServer() {
 	// Optionally, you could run srv.Shutdown in a goroutine and block on
 	// <-ctx.Done() if your application should wait for other services
 	// to finalize based on context cancellation.
-	s.Info("shutting down")
+	s.Logger.Info("shutting down")
 }
diff --git a/internal/http/user.go b/internal/http/user.go
@@ -11,17 +11,17 @@ import (
 )
 
 func (s Server) SetupUserRoutes() {
-	s.HandleFunc("/u/{user}", s.getUserInfoHandler).Methods("GET")
+	s.Router.HandleFunc("/u/{user}", s.getUserInfoHandler).Methods("GET")
 }
 
 func (s Server) getUserInfoHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	ctx := context.Background()
 	c := lemmy.GetLemmyClient(ctx)
-	s.Info(fmt.Sprintf("Looking up user %s", vars["user"]))
+	s.Logger.Info(fmt.Sprintf("Looking up user %s", vars["user"]))
 	user, err := c.GetUser(ctx, vars["user"])
 	if err != nil {
-		s.Error("Error reading user", err)
+		s.Logger.Error("Error reading user", err)
 		return
 	}
 

diff --git a/internal/log/log.go b/internal/log/log.go
@@ -2,10 +2,10 @@ package log
 
 import (
 	"encoding/json"
+	"github.com/rs/zerolog"
 	"io"
 	"net/http"
-
-	"github.com/rs/zerolog/log"
+	"os"
 )
 
 type Logger interface {
@@ -17,34 +17,37 @@ type Logger interface {
 	Request(msg string, r *http.Request)
 }
 
-type Log struct{}
+type Log struct {
+	*zerolog.Logger
+}
 
 func NewLogger() *Log {
-	log.Debug().Msg("Logger started")
-	return &Log{}
+	logger := zerolog.New(os.Stdout)
+	logger.Debug().Msg("Logger started")
+	return &Log{&logger}
 }
 
-func (l Log) Info(msg string) {
-	log.Info().Msg(msg)
+func (l *Log) Info(msg string) {
+	l.Logger.Info().Msg(msg)
 }
 
-func (l Log) Debug(msg string) {
-	log.Debug().Msg(msg)
+func (l *Log) Debug(msg string) {
+	l.Logger.Debug().Msg(msg)
 }
 
-func (l Log) Error(msg string, err error) {
-	log.Error().Err(err).Msg(msg)
+func (l *Log) Error(msg string, err error) {
+	l.Logger.Error().Err(err).Msg(msg)
 }
 
-func (l Log) Fatal(msg string, err error) {
-	log.Fatal().Err(err).Msg(msg)
+func (l *Log) Fatal(msg string, err error) {
+	l.Logger.Fatal().Err(err).Msg(msg)
 }
 
-func (l Log) Warn(msg string) {
-	log.Warn().Msg(msg)
+func (l *Log) Warn(msg string) {
+	l.Logger.Warn().Msg(msg)
 }
 
-func (l Log) Request(msg string, r *http.Request) {
+func (l *Log) Request(msg string, r *http.Request) {
 	defer func(Body io.ReadCloser) {
 		err := Body.Close()
 		if err != nil {
@@ -66,7 +69,7 @@ func (l Log) Request(msg string, r *http.Request) {
 	} else {
 		body = rawbody
 	}
-	log.Debug().
+	l.Logger.Debug().
 		Str("method", r.Method).
 		Str("url", r.URL.String()).
 		Str("user-agent", r.UserAgent()).