add binding host option

server/ctx/config.go

@@ -20,11 +20,12 @@ import (
 )
 
 var (
-	version = "mknote-v2.2.3"
+	version = "mknote-v2.2.4"
 	Config  *config
 )
 
 type config struct {
+	HostName      string
 	HomeDir       string
 	LogFile       string
 	LogLevel      int
@@ -43,6 +44,7 @@ func init() {
 	workDir := filepath.Dir(self)
 
 	Config = &config{
+		"",
 		workDir,
 		workDir + "/log/mknote.log",
 		1,
@@ -62,6 +64,7 @@ func init() {
 		}
 	}
 
+	flag.StringVar(&Config.HostName, "hostname", Config.HostName, "binding hostname")
 	flag.StringVar(&Config.LogFile, "log-file", Config.LogFile, "set log output file")
 	flag.IntVar(&Config.LogLevel, "log-level", Config.LogLevel, "set log output level, 0...4")
 	flag.StringVar(&Config.ArticlesDir, "articles-dir", Config.ArticlesDir, "markdown files dir")

server/server.go

@@ -15,7 +15,6 @@ package server
 
 import (
 	"context"
-	"fmt"
 	"mknote/server/controller/page"
 	"mknote/server/controller/rest"
 	"mknote/server/ctx"
@@ -75,11 +74,10 @@ func securityRest(h http.HandlerFunc) http.HandlerFunc {
 
 func securityHandler(h http.HandlerFunc) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		visitEntry := fmt.Sprint(r.Method, r.RemoteAddr, "=>", r.RequestURI, "["+r.UserAgent()+"] ")
-		ctx.Info(visitEntry)
+		ctx.Info(r.Method, r.RemoteAddr, "=>", r.RequestURI, "["+r.UserAgent()+"] ")
 		defer func() {
 			if err := recover(); err != nil {
-				ctx.Error(visitEntry, err)
+				ctx.Error(r.Method, r.RemoteAddr, "=>", r.RequestURI, "["+r.UserAgent()+"]", err)
 				http.Error(w, "500", http.StatusInternalServerError)
 			}
 		}()
@@ -88,7 +86,11 @@ func securityHandler(h http.HandlerFunc) http.HandlerFunc {
 }
 
 func redirect80(w http.ResponseWriter, r *http.Request) {
-	target := "https://" + r.Host + r.URL.Path
+	hostname := ctx.Config.HostName
+	if hostname == "" {
+		hostname = r.Host
+	}
+	target := "https://" + hostname + r.URL.Path
 	if len(r.URL.RawQuery) > 0 {
 		target += "?" + r.URL.RawQuery
 	}