merge upstream; fix port in use warning; new logger API

2014-06-26 16:37:56 +01:00
parent 098136b681 0ed19d9f20
commit da38faa8f7
6 changed files with 24 additions and 27 deletions
--- a/ethereum.go
+++ b/ethereum.go
@ -342,7 +342,7 @@ func (s *Ethereum) Start(seed bool) {
 	// Bind to addr and port
 	ln, err := net.Listen("tcp", ":"+s.Port)
 	if err != nil {
-		ethlogger.Warnln("Connection listening disabled. Acting as client")
+		ethlogger.Warnf("Port %s in use. Connection listening disabled. Acting as client", s.Port)
 		s.listening = false
 	} else {
 		s.listening = true