From 6775ded8ae9847da08874ff400f630df7aa32d1a Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Mon, 23 Aug 2021 20:27:17 +0300
Subject: [PATCH] update log

---
 server/cmd/main.go          |  2 +-
 server/cmd/preconfig_pos.go |  7 +++++--
 server/log/log.go           |  2 +-
 server/torr/apihelper.go    | 10 ++++++++--
 server/torr/stream.go       | 20 ++++++++++++--------
 server/web/server.go        |  2 +-
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/server/cmd/main.go b/server/cmd/main.go
index 43cf2e4..a7d9c67 100644
--- a/server/cmd/main.go
+++ b/server/cmd/main.go
@@ -55,7 +55,7 @@ func main() {
 	settings.HttpAuth = params.HttpAuth
 	log.Init(params.LogPath, params.WebLogPath)
 	fmt.Println("=========== START ===========")
-	fmt.Println("Build Go version:", runtime.Version())
+	fmt.Println("TorrServer", version.Version+",", runtime.Version())
 	if params.HttpAuth {
 		log.TLogln("Use HTTP Auth file", settings.Path+"/accs.db")
 	}
diff --git a/server/cmd/preconfig_pos.go b/server/cmd/preconfig_pos.go
index e3aa953..44b8e8b 100644
--- a/server/cmd/preconfig_pos.go
+++ b/server/cmd/preconfig_pos.go
@@ -8,6 +8,7 @@ import (
 	"syscall"
 		
 	"server/log"
+	"server/settings"
 )
 
 func Preconfig(dkill bool) {
@@ -22,8 +23,10 @@ func Preconfig(dkill bool) {
 		go func() {
 			for s := range sigc {
 				if dkill {
-					log.TLogln("Signal catched:", s)
-					log.TLogln("To stop server, close it from web / api")
+					if (settings.BTsets.EnableDebug || s != syscall.SIGPIPE) {
+						log.TLogln("Signal catched:", s)
+						log.TLogln("To stop server, close it from web / api")
+					}
 				}
 			}
 		}()
diff --git a/server/log/log.go b/server/log/log.go
index 9030bf5..6720534 100644
--- a/server/log/log.go
+++ b/server/log/log.go
@@ -50,7 +50,7 @@ func Init(path, webpath string) {
 		//https://stackoverflow.com/a/36140590
 		//fmt.Print(time.Now().UTC().Format("2006-01-02T15:04:05.999Z") + " TLOG  " + string(bytes))
 		log.SetFlags(log.Ldate|log.Ltime|log.LUTC|log.Lmsgprefix)
-		log.SetPrefix("0000 TLOG  ")
+		log.SetPrefix("UTC0 TLOG  ")
 		log.SetOutput(ff)
 	}
 }
diff --git a/server/torr/apihelper.go b/server/torr/apihelper.go
index 7752654..1eb3782 100644
--- a/server/torr/apihelper.go
+++ b/server/torr/apihelper.go
@@ -214,7 +214,7 @@ func SetSettings(set *sets.BTSets) {
 	}
 	lockApi.Lock()
 	defer lockApi.Unlock()
-	log.TLogln("drop all")
+	log.TLogln("drop all torrents")
 	dropAllTorrent()
 	time.Sleep(time.Second * 2)
 	log.TLogln("disconect")
@@ -222,6 +222,7 @@ func SetSettings(set *sets.BTSets) {
 	sets.SetBTSets(set)
 	log.TLogln("connect")
 	bts.Connect()
+	time.Sleep(time.Second * 2)
 	log.TLogln("end set settings")
 }
 
@@ -231,11 +232,16 @@ func SetDefSettings() {
 	}
 	lockApi.Lock()
 	defer lockApi.Unlock()
+	log.TLogln("drop all torrents")
 	dropAllTorrent()
+	time.Sleep(time.Second * 2)
+	log.TLogln("disconect")
 	bts.Disconnect()
 	sets.SetDefault()
+	log.TLogln("connect")
 	bts.Connect()
-	time.Sleep(time.Second * 5)
+	time.Sleep(time.Second * 2)
+	log.TLogln("end set default settings")
 }
 
 func dropAllTorrent() {
diff --git a/server/torr/stream.go b/server/torr/stream.go
index 2072811..aba5a66 100644
--- a/server/torr/stream.go
+++ b/server/torr/stream.go
@@ -48,10 +48,12 @@ func (t *Torrent) Stream(fileID int, req *http.Request, resp http.ResponseWriter
 	reader := t.NewReader(file)
 
 	host, port, err := net.SplitHostPort(req.RemoteAddr)
-	if err != nil {
-		log.Println("Connect client")
-	} else {
-		log.Println("Connect client", host, port)
+	if sets.BTsets.EnableDebug {
+		if err != nil {
+			log.Println("Connect client")
+		} else {
+			log.Println("Connect client", host, port)
+		}
 	}
 	
 	sets.SetViewed(&sets.Viewed{t.Hash().HexString(), fileID})
@@ -62,10 +64,12 @@ func (t *Torrent) Stream(fileID int, req *http.Request, resp http.ResponseWriter
 	http.ServeContent(resp, req, file.Path(), time.Unix(t.Timestamp, 0), reader)
 
 	t.CloseReader(reader)
-	if err != nil {
-		log.Println("Disconnect client")
-	} else {
-		log.Println("Disconnect client", host, port)
+	if sets.BTsets.EnableDebug {
+		if err != nil {
+			log.Println("Disconnect client")
+		} else {
+			log.Println("Disconnect client", host, port)
+		}
 	}
 	return nil
 }
diff --git a/server/web/server.go b/server/web/server.go
index 71f142e..2e655c4 100644
--- a/server/web/server.go
+++ b/server/web/server.go
@@ -22,7 +22,7 @@ var (
 )
 
 func Start(port string) {
-	log.TLogln("Start TorrServer", version.Version)
+	log.TLogln("Start TorrServer")
 	ips := getLocalIps()
 	if len(ips) > 0 {
 		log.TLogln("IP:", ips)