diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-24 18:31:45 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-24 18:31:45 +0800 |
| commit | 804af9658a89555d6b4069433676acdb6deb9742 (patch) | |
| tree | 89d7846d715ea225229489428e26c1bad2435dc9 | |
| parent | fb1edd05f40bad04f2514d1463b5593dc51e9f77 (diff) | |
| parent | 9d429180f995f61e3448f9e0ffce713434590055 (diff) | |
| download | dexon-804af9658a89555d6b4069433676acdb6deb9742.tar dexon-804af9658a89555d6b4069433676acdb6deb9742.tar.gz dexon-804af9658a89555d6b4069433676acdb6deb9742.tar.bz2 dexon-804af9658a89555d6b4069433676acdb6deb9742.tar.lz dexon-804af9658a89555d6b4069433676acdb6deb9742.tar.xz dexon-804af9658a89555d6b4069433676acdb6deb9742.tar.zst dexon-804af9658a89555d6b4069433676acdb6deb9742.zip | |
merge
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 | ||||
| -rw-r--r-- | cmd/utils/websockets.go | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index e4070aa47..3f9a2a838 100644 --- a/cmd/ethereum/main.go +++ b/cmd/ethereum/main.go @@ -31,7 +31,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.7.10" + Version = "0.7.11" ) var clilogger = logger.NewLogger("CLI") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 72e77940d..6f578ff48 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -31,7 +31,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.7.10" + Version = "0.7.11" ) var ethereum *eth.Ethereum diff --git a/cmd/utils/websockets.go b/cmd/utils/websockets.go index 29f9b8aeb..e4bc1b185 100644 --- a/cmd/utils/websockets.go +++ b/cmd/utils/websockets.go @@ -3,10 +3,13 @@ package utils import ( "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/websocket" "github.com/ethereum/go-ethereum/xeth" ) +var wslogger = logger.NewLogger("WS") + func args(v ...interface{}) []interface{} { return v } @@ -106,6 +109,8 @@ func (self *WebSocketServer) Serv() { } func StartWebSockets(eth *eth.Ethereum) { + wslogger.Infoln("Starting WebSockets") + sock := NewWebSocketServer(eth) go sock.Serv() } |