idk/reseed-tools
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

remove timeout

Browse Source
This commit is contained in:
Matt Drollette
2014-09-13 14:30:29 -05:00
parent 88602cac2c
commit 4073b199b1
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli.go
View File

@@ -16,7 +16,7 @@ func main() {
{ {
Name: "serve", Name: "serve",
ShortName: "s", ShortName: "s",
Usage: "Start an http server for SU3 files", Usage: "Start an http(s) reseed server",
Flags: []cli.Flag{ Flags: []cli.Flag{
cli.StringFlag{ cli.StringFlag{
Name: "addr", Name: "addr",
@@ -30,12 +30,10 @@ func main() {
}, },
cli.StringFlag{ cli.StringFlag{
Name: "cert", Name: "cert",
Value: "cert.pem",
Usage: "Certificate for TLS", Usage: "Certificate for TLS",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "key", Name: "key",
Value: "key.pem",
Usage: "Key for TLS certificate", Usage: "Key for TLS certificate",
}, },
cli.StringFlag{ cli.StringFlag{

13
reseeder.go
View File

@@ -73,14 +73,11 @@ func Run(config *Config) {
s := r.PathPrefix("/netdb").Subrouter() s := r.PathPrefix("/netdb").Subrouter()
s.HandleFunc("/", legacyReseeder.ListHandler) s.HandleFunc("/", legacyReseeder.ListHandler)
s.HandleFunc("/i2pseeds.su3", su3Reseeder.Su3Handler)
s.HandleFunc(`/routerInfo-{hash:[A-Za-z0-9+/\-=~]+}.dat`, legacyReseeder.RouterInfoHandler) s.HandleFunc(`/routerInfo-{hash:[A-Za-z0-9+/\-=~]+}.dat`, legacyReseeder.RouterInfoHandler)
s.HandleFunc("/i2pseeds.su3", su3Reseeder.Su3Handler)
// timeout
muxWithMiddlewares := http.TimeoutHandler(r, time.Second*5, "Timeout!")
th := throttled.RateLimit(throttled.PerMin(config.RateLimit), &throttled.VaryBy{RemoteAddr: true}, store.NewMemStore(1000)) th := throttled.RateLimit(throttled.PerMin(config.RateLimit), &throttled.VaryBy{RemoteAddr: true}, store.NewMemStore(1000))
muxWithMiddlewares = th.Throttle(muxWithMiddlewares) muxWithMiddlewares := th.Throttle(r)
if config.Proxy { if config.Proxy {
muxWithMiddlewares = proxiedHandler(muxWithMiddlewares) muxWithMiddlewares = proxiedHandler(muxWithMiddlewares)
@@ -92,16 +89,14 @@ func Run(config *Config) {
listenAddress := fmt.Sprintf("%s:%s", config.Addr, config.Port) listenAddress := fmt.Sprintf("%s:%s", config.Addr, config.Port)
// try to start tls server
if config.Cert != "" && config.Key != "" { if config.Cert != "" && config.Key != "" {
log.Println("Starting TLS reseed server on " + listenAddress) log.Println("Starting http reseed server on " + listenAddress)
err := http.ListenAndServeTLS(listenAddress, config.Cert, config.Key, muxWithMiddlewares) err := http.ListenAndServeTLS(listenAddress, config.Cert, config.Key, muxWithMiddlewares)
if nil != err { if nil != err {
log.Fatalln(err) log.Fatalln(err)
} }
} else { } else {
// fall back to regular http server log.Println("Starting https reseed server on " + listenAddress)
log.Println("Starting reseed server on " + listenAddress)
err := http.ListenAndServe(listenAddress, muxWithMiddlewares) err := http.ListenAndServe(listenAddress, muxWithMiddlewares)
if nil != err { if nil != err {
log.Fatalln(err) log.Fatalln(err)