From 391b08a09d3c5df1dc555cc70462ac21810882e7 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Mon, 16 May 2022 03:06:47 +0300 Subject: [PATCH 1/2] unify log --- server/dlna/dlna.go | 19 ++++++++++--------- server/log/log.go | 8 ++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/server/dlna/dlna.go b/server/dlna/dlna.go index 6be421b..af73b01 100644 --- a/server/dlna/dlna.go +++ b/server/dlna/dlna.go @@ -21,14 +21,14 @@ import ( var dmsServer *dms.Server func Start() { - logger := log.Default.WithNames("dms") + logger := log.Default.WithNames("dlna") dmsServer = &dms.Server{ Logger: logger.WithNames("dms", "server"), Interfaces: func() (ifs []net.Interface) { var err error ifaces, err := net.Interfaces() if err != nil { - log.Print(err) + logger.Print(err) os.Exit(1) } for _, i := range ifaces { @@ -43,7 +43,7 @@ func Start() { HTTPConn: func() net.Listener { port := 9080 for { - log.Printf("Check dlna port %d", port) + logger.Printf("Check dlna port %d", port) m, err := net.Listen("tcp", ":"+strconv.Itoa(port)) if m != nil { m.Close() @@ -53,10 +53,10 @@ func Start() { } port++ } - log.Printf("Set dlna port %d", port) + logger.Printf("Set dlna port %d", port) conn, err := net.Listen("tcp", ":"+strconv.Itoa(port)) if err != nil { - log.Print(err) + logger.Print(err) os.Exit(1) } return conn @@ -96,12 +96,12 @@ func Start() { } if err := dmsServer.Init(); err != nil { - log.Printf("error initing dms server: %v", err) + logger.Printf("error initing dms server: %v", err) os.Exit(1) } go func() { if err := dmsServer.Run(); err != nil { - log.Print(err) + logger.Print(err) os.Exit(1) } }() @@ -139,17 +139,18 @@ func onBrowseMeta(path string, rootObjectPath string, host, userAgent string) (r } func getDefaultFriendlyName() string { + logger := log.Default.WithNames("dlna") ret := "TorrServer" userName := "" user, err := user.Current() if err != nil { - log.Printf("getDefaultFriendlyName could not get username: %s", err) + logger.Printf("getDefaultFriendlyName could not get username: %s", err) } else { userName = user.Name } host, err := os.Hostname() if err != nil { - log.Printf("getDefaultFriendlyName could not get hostname: %s", err) + logger.Printf("getDefaultFriendlyName could not get hostname: %s", err) } if userName == "" && host == "" { diff --git a/server/log/log.go b/server/log/log.go index bb9cf95..3de78c1 100644 --- a/server/log/log.go +++ b/server/log/log.go @@ -7,6 +7,7 @@ import ( "log" "os" "strings" + "time" "github.com/gin-gonic/gin" ) @@ -47,10 +48,9 @@ func Init(path, webpath string) { logFile = ff os.Stdout = ff os.Stderr = ff - //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("UTC0 SRV ") + t := time.Now().Format("2006-01-02T15:04:05-0700") + log.SetFlags(log.Lmsgprefix) + log.SetPrefix(t + " SRV ") log.SetOutput(ff) } } From 39616cbd0e6686899b045539fa373dcf0ffa7be1 Mon Sep 17 00:00:00 2001 From: nikk gitanes Date: Mon, 16 May 2022 05:03:11 +0300 Subject: [PATCH 2/2] fix log panic with dms --- server/go.mod | 2 +- server/go.sum | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/server/go.mod b/server/go.mod index 2ad6bb2..a479484 100644 --- a/server/go.mod +++ b/server/go.mod @@ -3,7 +3,7 @@ module server go 1.18 replace ( - github.com/anacrolix/dms v1.4.0 => github.com/tsynik/dms v1.4.1 + github.com/anacrolix/dms v1.4.0 => github.com/tsynik/dms v1.4.2 github.com/tidwall/btree v1.3.1 => github.com/tidwall/btree v0.7.2-0.20211211132910-4215444137fc ) diff --git a/server/go.sum b/server/go.sum index f316b34..847b089 100644 --- a/server/go.sum +++ b/server/go.sum @@ -44,7 +44,6 @@ github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgw github.com/anacrolix/log v0.6.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= github.com/anacrolix/log v0.10.0/go.mod h1:s5yBP/j046fm9odtUTbHOfDUq/zh1W8OkPpJtnX0oQI= github.com/anacrolix/log v0.10.1-0.20220123034749-3920702c17f8/go.mod h1:GmnE2c0nvz8pOIPUSC9Rawgefy1sDXqposC2wgtBZE4= -github.com/anacrolix/log v0.10.1-0.20220126091220-5c1b6f3af59c/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68= github.com/anacrolix/log v0.13.1 h1:BmVwTdxHd5VcNrLylgKwph4P4wf+5VvPgOK4yi91fTY= github.com/anacrolix/log v0.13.1/go.mod h1:D4+CvN8SnruK6zIFS/xPoRJmtvtnxs+CSfDQ+BFxZ68= github.com/anacrolix/lsan v0.0.0-20211126052245-807000409a62 h1:P04VG6Td13FHMgS5ZBcJX23NPC/fiC4cp9bXwYujdYM= @@ -355,8 +354,8 @@ github.com/tidwall/btree v0.7.2-0.20211211132910-4215444137fc/go.mod h1:LGm8L/DZ github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tsynik/dms v1.4.1 h1:K+Aavli0oEf+dW+jv/D1/Zza7j01/EZGynkbCbe72IE= -github.com/tsynik/dms v1.4.1/go.mod h1:cpveZyOGE7M14mQKnd5T9AsUNQMRlWC0J7PgmGMBjmM= +github.com/tsynik/dms v1.4.2 h1:WDwjKBAjvTR1a6xycUNz+1OGmqhxMkWalof2k4msH4Q= +github.com/tsynik/dms v1.4.2/go.mod h1:tyr6Ns5fHG1ejdBvA6FoJPS34KSWsY8qQPbcPsRNdtk= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= @@ -405,7 +404,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201201195509-5d6afe98e0b7/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -450,7 +448,6 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a h1:N2T1jUrTQE9Re6TFF5PhvEHXHCguynGhKjWVsIUt5cY= golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=