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

fix default listen port

Browse Source
This commit is contained in:
nikk gitanes
2022-05-26 14:56:31 +03:00
parent 9efc266f19
commit e46f247679
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/cmd/main.go
View File

@@ -23,7 +23,7 @@ import (
) )
type args struct { type args struct {
Port string `arg:"-p" help:"web server port"` Port string `arg:"-p" help:"web server port, default :8090"`
Path string `arg:"-d" help:"database dir path"` Path string `arg:"-d" help:"database dir path"`
LogPath string `arg:"-l" help:"server log file path"` LogPath string `arg:"-l" help:"server log file path"`
WebLogPath string `arg:"-w" help:"web access log file path"` WebLogPath string `arg:"-w" help:"web access log file path"`
@@ -32,7 +32,7 @@ type args struct {
DontKill bool `arg:"-k" help:"don't kill server on signal"` DontKill bool `arg:"-k" help:"don't kill server on signal"`
UI bool `arg:"-u" help:"open torrserver page in browser"` UI bool `arg:"-u" help:"open torrserver page in browser"`
TorrentsDir string `arg:"-t" help:"autoload torrents from dir"` TorrentsDir string `arg:"-t" help:"autoload torrents from dir"`
TorrentAddr string `default:":32000" help:"Torrent client address"` TorrentAddr string `help:"Torrent client address, default :32000"`
PubIPv4 string `arg:"-4" help:"set public IPv4 addr"` PubIPv4 string `arg:"-4" help:"set public IPv4 addr"`
PubIPv6 string `arg:"-6" help:"set public IPv6 addr"` PubIPv6 string `arg:"-6" help:"set public IPv6 addr"`
} }

13
server/torr/btserver.go
View File

@@ -121,26 +121,27 @@ func (bt *BTServer) configure(ctx context.Context) {
bt.config.UploadRateLimiter = utils.Limit(settings.BTsets.UploadRateLimit * 1024) bt.config.UploadRateLimiter = utils.Limit(settings.BTsets.UploadRateLimit * 1024)
} }
if settings.TorAddr != "" { if settings.TorAddr != "" {
log.Println("Set listen addr", settings.TorAddr)
bt.config.SetListenAddr(settings.TorAddr) bt.config.SetListenAddr(settings.TorAddr)
} else { } else {
if settings.BTsets.PeersListenPort > 0 { if settings.BTsets.PeersListenPort > 0 {
log.Println("Set listen port", settings.BTsets.PeersListenPort) log.Println("Set listen port", settings.BTsets.PeersListenPort)
bt.config.ListenPort = settings.BTsets.PeersListenPort bt.config.ListenPort = settings.BTsets.PeersListenPort
} else { } else {
upnpport := 32000 lport := 32000
for { for {
log.Println("Check upnp port", upnpport) log.Println("Check listen port", lport)
l, err := net.Listen("tcp", ":"+strconv.Itoa(upnpport)) l, err := net.Listen("tcp", ":"+strconv.Itoa(lport))
if l != nil { if l != nil {
l.Close() l.Close()
} }
if err == nil { if err == nil {
break break
} }
upnpport++ lport++
} }
log.Println("Set upnp port", upnpport) log.Println("Set listen port", lport)
bt.config.ListenPort = upnpport bt.config.ListenPort = lport
} }
} }