From a6abd698320a3cd7b1f81355fb3ead3f6e7b63ad Mon Sep 17 00:00:00 2001
From: e_forbes <eforbes@gitlab.com>
Date: Thu, 13 Nov 2025 10:24:07 +0000
Subject: [PATCH 1/2] Moves away from init functions and moves maxprocs to main

---
 main.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/main.go b/main.go
index a984311db..d80c4216f 100644
--- a/main.go
+++ b/main.go
@@ -16,13 +16,6 @@ import (
 	"gitlab.com/gitlab-org/gitlab-pages/metrics"
 )
 
-func init() {
-	_, err := maxprocs.Set()
-	if err != nil {
-		log.WithError(err).Error("could not set automaxprocs")
-	}
-}
-
 // VERSION stores the information about the semantic version of application
 var VERSION = "dev"
 
@@ -95,6 +88,11 @@ func printVersion(showVersion bool, version string) {
 }
 
 func main() {
+	_, err := maxprocs.Set()
+	if err != nil {
+		log.WithError(err).Error("could not set automaxprocs")
+	}
+
 	logrus.SetOutput(os.Stderr)
 
 	metrics.MustRegister()
-- 
GitLab


From 905dd363552abe74d60f94afdc3f0d9469826565 Mon Sep 17 00:00:00 2001
From: e_forbes <eforbes@gitlab.com>
Date: Thu, 13 Nov 2025 11:05:08 +0000
Subject: [PATCH 2/2] Removes the dependency on logrus for server.go

This also remove some unnecessary redundancy in the fields being emitted
on server startup.
---
 server.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/server.go b/server.go
index 9d667157d..5b2502c64 100644
--- a/server.go
+++ b/server.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	stdlog "log"
+	"log"
+	"log/slog"
 	"net"
 	"net/http"
+	"os"
 	"path/filepath"
 
 	"github.com/pires/go-proxyproto"
-	"github.com/sirupsen/logrus"
-	"gitlab.com/gitlab-org/labkit/log"
 
 	"gitlab.com/gitlab-org/gitlab-pages/internal/netutil"
 )
@@ -27,7 +27,7 @@ func newHTTPServer(a *theApp) *http.Server {
 		ReadTimeout:       a.config.Server.ReadTimeout,
 		ReadHeaderTimeout: a.config.Server.ReadHeaderTimeout,
 		WriteTimeout:      a.config.Server.WriteTimeout,
-		ErrorLog:          stdlog.New(logrus.StandardLogger().Writer(), "", 0),
+		ErrorLog:          log.New(os.Stdout, "", 0),
 	}
 }
 
@@ -74,10 +74,9 @@ func (a *theApp) listenAndServe(server *http.Server, addr string, h http.Handler
 		l = tls.NewListener(l, server.TLSConfig)
 	}
 
-	log.WithFields(log.Fields{
-		"config_addr": addr,
-		"listen_addr": l.Addr(),
-	}).Infof("server listening on: %s", l.Addr())
+	slog.Info(
+		fmt.Sprintf("server listening on %s", l.Addr()),
+	)
 
 	return server.Serve(l)
 }
-- 
GitLab