From a736d08701276ba1834b018df92dc8a3cf09f751 Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Mon, 13 Nov 2023 02:40:22 +0300
Subject: [PATCH] change ssl port type in DB and fix apply

---
 server/cmd/main.go        | 4 ----
 server/server.go          | 6 ++++--
 server/settings/btsets.go | 2 +-
 server/web/server.go      | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/server/cmd/main.go b/server/cmd/main.go
index 1ef3ec5..27d307a 100644
--- a/server/cmd/main.go
+++ b/server/cmd/main.go
@@ -60,10 +60,6 @@ func main() {
 		params.Port = "8090"
 	}
 
-	if params.SslPort == "" {
-		params.SslPort = "8091"
-	}
-
 	settings.Path = params.Path
 	settings.HttpAuth = params.HttpAuth
 	log.Init(params.LogPath, params.WebLogPath)
diff --git a/server/server.go b/server/server.go
index 84d8b9c..6ceb6b2 100644
--- a/server/server.go
+++ b/server/server.go
@@ -4,6 +4,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strconv"
 
 	"server/log"
 	"server/settings"
@@ -17,8 +18,9 @@ func Start(port, sslport, sslCert, sslKey string, sslEnabled, roSets, searchWA b
 		// set settings ssl enabled
 		settings.Ssl = sslEnabled
 		if sslport == "" {
-			if settings.BTsets.SslPort != "" {
-				sslport = settings.BTsets.SslPort
+			userSSlPort := strconv.Itoa(settings.BTsets.SslPort)
+			if userSSlPort != "0" {
+				sslport = userSSlPort
 			} else {
 				sslport = "8091"
 			}
diff --git a/server/settings/btsets.go b/server/settings/btsets.go
index 1553fac..f742e36 100644
--- a/server/settings/btsets.go
+++ b/server/settings/btsets.go
@@ -48,7 +48,7 @@ type BTSets struct {
 	PeersListenPort   int
 
 	// HTTPS
-	SslPort string
+	SslPort int
 	SslCert string
 	SslKey  string
 }
diff --git a/server/web/server.go b/server/web/server.go
index 2f59f8f..b4064e9 100644
--- a/server/web/server.go
+++ b/server/web/server.go
@@ -73,7 +73,6 @@ func Start() {
 		dlna.Start()
 	}
 
-	log.TLogln(settings.BTsets)
 	//check if https enabled
 	if settings.Ssl {
 		//if no cert and key files set in db/settings, generate new self-signed cert and key files
@@ -92,7 +91,7 @@ func Start() {
 			settings.SetBTSets(settings.BTsets)
 		}
 		go func() {
-			log.TLogln("Starting https server at port", settings.SslPort)
+			log.TLogln("Start https server at port", settings.SslPort)
 			waitChan <- route.RunTLS(":"+settings.SslPort, settings.BTsets.SslCert, settings.BTsets.SslKey)
 		}()
 	}