From b6b053665e289050ef39ff49765ef1451872057c Mon Sep 17 00:00:00 2001
From: Niko Kivel <niko.kivel@gmail.com>
Date: Fri, 17 Sep 2021 14:27:55 +0200
Subject: [PATCH 1/2] Fixes #135

---
 internal/pkg/warewulfd/warewulfd.go | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/internal/pkg/warewulfd/warewulfd.go b/internal/pkg/warewulfd/warewulfd.go
index e84a0357..6007e0e8 100644
--- a/internal/pkg/warewulfd/warewulfd.go
+++ b/internal/pkg/warewulfd/warewulfd.go
@@ -6,6 +6,10 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+	"strconv"
+
+	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
 )
 
 // TODO: https://github.com/danderson/netboot/blob/master/pixiecore/dhcp.go
@@ -37,9 +41,22 @@ func RunServer() error {
 	http.HandleFunc("/overlay-system/", SystemOverlaySend)
 	http.HandleFunc("/overlay-runtime", RuntimeOverlaySend)
 
+	conf, err := warewulfconf.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not get Warewulf configuration: %s\n", err)
+		os.Exit(1)
+	}
+
+	daemonPort := 9873
+	if conf.Warewulf.Port != daemonPort {
+		daemonPort = conf.Warewulf.Port
+	} else {
+		fmt.Printf("INFO: warewulfd port not configured, defaulting to 9873\n")
+	}
+
 	daemonLogf("Starting HTTPD REST service\n")
 
-	err = http.ListenAndServe(":9873", nil)
+	err = http.ListenAndServe(":" + strconv.Itoa(daemonPort), nil)
 	if err != nil {
 		fmt.Printf("ERROR: Could not start listening service: %s\n", err)
 		os.Exit(1)

From 4040f5145b23b3d7b9e6713735b9ec645d6373ad Mon Sep 17 00:00:00 2001
From: Niko Kivel <niko.kivel@gmail.com>
Date: Mon, 20 Sep 2021 08:58:06 +0200
Subject: [PATCH 2/2] errors.Wrap implemented, removed redundant default port
 check

---
 internal/pkg/warewulfd/warewulfd.go | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/internal/pkg/warewulfd/warewulfd.go b/internal/pkg/warewulfd/warewulfd.go
index 6007e0e8..2cf18678 100644
--- a/internal/pkg/warewulfd/warewulfd.go
+++ b/internal/pkg/warewulfd/warewulfd.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 
 	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
+	"github.com/pkg/errors"
 )
 
 // TODO: https://github.com/danderson/netboot/blob/master/pixiecore/dhcp.go
@@ -43,23 +43,15 @@ func RunServer() error {
 
 	conf, err := warewulfconf.New()
 	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Could not get Warewulf configuration: %s\n", err)
-		os.Exit(1)
+	  return errors.Wrap(err, "could not get Warewulf configuration")
 	}
 
-	daemonPort := 9873
-	if conf.Warewulf.Port != daemonPort {
-		daemonPort = conf.Warewulf.Port
-	} else {
-		fmt.Printf("INFO: warewulfd port not configured, defaulting to 9873\n")
-	}
-
-	daemonLogf("Starting HTTPD REST service\n")
+  daemonPort := conf.Warewulf.Port
+	daemonLogf("Starting HTTPD REST service on port %d\n", daemonPort)
 
 	err = http.ListenAndServe(":" + strconv.Itoa(daemonPort), nil)
 	if err != nil {
-		fmt.Printf("ERROR: Could not start listening service: %s\n", err)
-		os.Exit(1)
+	  return errors.Wrap(err, "Could not start listening service")
 	}
 
 	return nil