cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
obscuren 2014-12-24 11:31:45 +01:00
commit 804af9658a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ethereum/main.go
View File

@ -31,7 +31,7 @@ import (
const ( const (
ClientIdentifier = "Ethereum(G)" ClientIdentifier = "Ethereum(G)"
Version = "0.7.10" Version = "0.7.11"
) )
var clilogger = logger.NewLogger("CLI") var clilogger = logger.NewLogger("CLI")

2
cmd/mist/main.go
View File

@ -31,7 +31,7 @@ import (
const ( const (
ClientIdentifier = "Mist" ClientIdentifier = "Mist"
Version = "0.7.10" Version = "0.7.11"
) )
var ethereum *eth.Ethereum var ethereum *eth.Ethereum

5
cmd/utils/websockets.go
View File

@ -3,10 +3,13 @@ package utils
import ( import (
"github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/websocket" "github.com/ethereum/go-ethereum/websocket"
"github.com/ethereum/go-ethereum/xeth" "github.com/ethereum/go-ethereum/xeth"
) )
var wslogger = logger.NewLogger("WS")
func args(v ...interface{}) []interface{} { func args(v ...interface{}) []interface{} {
return v return v
} }
@ -106,6 +109,8 @@ func (self *WebSocketServer) Serv() {
} }
func StartWebSockets(eth *eth.Ethereum) { func StartWebSockets(eth *eth.Ethereum) {
wslogger.Infoln("Starting WebSockets")
sock := NewWebSocketServer(eth) sock := NewWebSocketServer(eth)
go sock.Serv() go sock.Serv()
} }