sovonegr/TorrServerJellyfin
1
0
Fork 0
mirror of https://github.com/Ernous/TorrServerJellyfin.git synced 2025-12-19 21:46:11 +05:00
Code Issues Packages Projects Releases Wiki Activity

unify log

Browse Source
This commit is contained in:
nikk gitanes
2022-05-16 03:06:47 +03:00
parent 14030ad625
commit a5fe362331
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/dlna/dlna.go
View File

@@ -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 == "" {

8
server/log/log.go
View File

@@ -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)
}
}