From 1351bbae5610caa1cb6ac9b727ff5296b157273c Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Sun, 6 Apr 2025 01:41:43 +0800
Subject: Slight refactor on NewServer

---
 server.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'server.go')

diff --git a/server.go b/server.go
index fdedf3c..3a90e1c 100644
--- a/server.go
+++ b/server.go
@@ -49,14 +49,18 @@ type Server struct {
 	ready bool
 }
 
-func (s *Server) Setup() {
+func (s *Server) NewServer(configPath string) error {
+	if err := s.loadConfig(configPath); err != nil {
+		return err
+	}
+
 	s.sourceHandler = http.StripPrefix(
 		"/-/source/",
 		http.FileServer(http.FS(embeddedSourceFS)),
 	)
 	staticFS, err := fs.Sub(embeddedResourcesFS, "static")
 	if err != nil {
-		panic(err)
+		return err
 	}
 	s.staticHandler = http.StripPrefix("/-/static/", http.FileServer(http.FS(staticFS)))
 	s.globalData = map[string]any{
@@ -72,6 +76,8 @@ func (s *Server) Setup() {
 	misc.NoneOrPanic(os.Chmod(filepath.Join(s.config.Hooks.Execs, "pre-receive"), 0o755))
 
 	s.ready = true
+
+	return nil
 }
 
 func (s *Server) Run() error {
-- 
cgit v1.2.3