fix default listen port

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

View File

@@ -23,7 +23,7 @@ import (
)
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"`
LogPath string `arg:"-l" help:"server 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"`
UI bool `arg:"-u" help:"open torrserver page in browser"`
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"`
PubIPv6 string `arg:"-6" help:"set public IPv6 addr"`
}

View File

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