diff --git a/server/cmd/main.go b/server/cmd/main.go index d193748..ddca128 100644 --- a/server/cmd/main.go +++ b/server/cmd/main.go @@ -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"` } diff --git a/server/torr/btserver.go b/server/torr/btserver.go index 16739e0..e4c2214 100644 --- a/server/torr/btserver.go +++ b/server/torr/btserver.go @@ -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 } }