From 8dad8862f5e1566510cab72affd2a0a9ffaadebc Mon Sep 17 00:00:00 2001
From: nikk gitanes <tsynik@gmail.com>
Date: Mon, 9 Aug 2021 04:31:10 +0300
Subject: [PATCH] update logging

---
 server/torr/btserver.go |  3 ++-
 server/torr/stream.go   | 16 +++++++++++++---
 server/web/server.go    |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/server/torr/btserver.go b/server/torr/btserver.go
index 5e361f4..c8eedaf 100644
--- a/server/torr/btserver.go
+++ b/server/torr/btserver.go
@@ -94,6 +94,7 @@ func (bt *BTServer) configure() {
 		bt.config.UploadRateLimiter = utils.Limit(settings.BTsets.UploadRateLimit * 1024)
 	}
 	if settings.BTsets.PeersListenPort > 0 {
+		log.Println("Set listen port", settings.BTsets.PeersListenPort)
 		bt.config.ListenPort = settings.BTsets.PeersListenPort
 	} else {
 		upnpport := 32000
@@ -112,7 +113,7 @@ func (bt *BTServer) configure() {
 		bt.config.ListenPort = upnpport
 	}
 
-	log.Println("Configure client:", settings.BTsets)
+	log.Println("Client config:", settings.BTsets)
 }
 
 func (bt *BTServer) GetTorrent(hash torrent.InfoHash) *Torrent {
diff --git a/server/torr/stream.go b/server/torr/stream.go
index 92c5b96..2072811 100644
--- a/server/torr/stream.go
+++ b/server/torr/stream.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net"
 	"net/http"
 	"time"
 
@@ -46,8 +47,13 @@ func (t *Torrent) Stream(fileID int, req *http.Request, resp http.ResponseWriter
 
 	reader := t.NewReader(file)
 
-	log.Println("Connect client")
-
+	host, port, err := net.SplitHostPort(req.RemoteAddr)
+	if err != nil {
+		log.Println("Connect client")
+	} else {
+		log.Println("Connect client", host, port)
+	}
+	
 	sets.SetViewed(&sets.Viewed{t.Hash().HexString(), fileID})
 
 	resp.Header().Set("Connection", "close")
@@ -56,6 +62,10 @@ 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)
-	log.Println("Disconnect client")
+	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 5468854..71f142e 100644
--- a/server/web/server.go
+++ b/server/web/server.go
@@ -51,7 +51,7 @@ func Start(port string) {
 		api.SetupRoute(&route.RouterGroup)
 		pages.SetupRoute(&route.RouterGroup)
 	}
-	log.TLogln("Start web", port)
+	log.TLogln("Start web server at port", port)
 	waitChan <- route.Run(":" + port)
 }