aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-24 18:31:45 +0800
committerobscuren <geffobscura@gmail.com>2014-12-24 18:31:45 +0800
commit804af9658a89555d6b4069433676acdb6deb9742 (patch)
tree89d7846d715ea225229489428e26c1bad2435dc9 /cmd
parentfb1edd05f40bad04f2514d1463b5593dc51e9f77 (diff)
parent9d429180f995f61e3448f9e0ffce713434590055 (diff)
downloadgo-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar.gz
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar.bz2
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar.lz
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar.xz
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.tar.zst
go-tangerine-804af9658a89555d6b4069433676acdb6deb9742.zip
merge
Diffstat (limited to 'cmd')
-rw-r--r--cmd/ethereum/main.go2
-rw-r--r--cmd/mist/main.go2
-rw-r--r--cmd/utils/websockets.go5
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()
}