some fixes

logdyhq · Jun 28, 2024 · 9541bf0 · 9541bf0 · chenrui333 · Jun 28, 2024
1 parent 2767b17
commit 9541bf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/example-app/main.go b/example-app/main.go
@@ -66,7 +66,7 @@ func exampleWithWebserver() {
 
 	logger = logdy.InitializeLogdy(logdy.Config{
 		HttpPathPrefix: "/_logdy-ui",
-		LogLevel:       logdy.LOG_LEVEL_VERBOSE,
+		LogLevel:       logdy.LOG_LEVEL_NORMAL,
 	}, nil)
 
 	log.Fatal(http.ListenAndServe(":8080", nil))

diff --git a/http/http.go b/http/http.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"reflect"
 	"strconv"
 	"strings"
 	"sync"
@@ -384,7 +385,8 @@ func HandleHttp(config *Config, clients *ClientsStruct, serveMux hand) {
 	// Use the file system to serve static files
 	fs := http.FileServer(http.FS(assets))
 
-	if serveMux == nil {
+	if reflect.ValueOf(serveMux).IsNil() {
+		utils.Logger.Debug("Using net/http")
 		http.Handle(config.HttpPathPrefix, http.StripPrefix(config.HttpPathPrefix, fs))
 		http.HandleFunc(config.HttpPathPrefix+"api/check-pass", handleCheckPass(config.UiPass))
 		http.HandleFunc(config.HttpPathPrefix+"api/status", handleStatus(config))
@@ -393,6 +395,7 @@ func HandleHttp(config *Config, clients *ClientsStruct, serveMux hand) {
 		http.HandleFunc(config.HttpPathPrefix+"api/client/peek-log", handleClientPeek(clients))
 		http.HandleFunc(config.HttpPathPrefix+"ws", handleWs(config.UiPass, clients))
 	} else {
+		utils.Logger.Debug("Using serveMux", serveMux)
 		serveMux.Handle(config.HttpPathPrefix, http.StripPrefix(config.HttpPathPrefix, fs))
 		serveMux.HandleFunc(config.HttpPathPrefix+"api/check-pass", handleCheckPass(config.UiPass))
 		serveMux.HandleFunc(config.HttpPathPrefix+"api/status", handleStatus(config))
@@ -405,6 +408,7 @@ func HandleHttp(config *Config, clients *ClientsStruct, serveMux hand) {
 }
 
 func StartWebserver(config *Config) {
+	utils.Logger.Debug("Starting webserver")
 	utils.Logger.WithFields(logrus.Fields{
 		"port": config.ServerPort,
 	}).Info("WebUI started, visit http://" + config.ServerIp + ":" + config.ServerPort + config.HttpPathPrefix)