Merge branch 'develop' into feature/rpc

2014-05-02 13:35:54 +02:00
parent ebdf339a61 70c8656640
commit c54788338a
7 changed files with 65 additions and 62 deletions
--- a/ethereum.go
+++ b/ethereum.go
@ -354,7 +354,7 @@ func (s *Ethereum) WaitForShutdown() {
 func (s *Ethereum) upnpUpdateThread() {
 	// Go off immediately to prevent code duplication, thereafter we renew
 	// lease every 15 minutes.
-	timer := time.NewTimer(0 * time.Second)
+	timer := time.NewTimer(5 * time.Minute)
 	lport, _ := strconv.ParseInt(s.Port, 10, 16)
 	first := true
 out: