gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ethlog => logger

Browse Source
This commit is contained in:
obscuren
2014-10-31 12:56:05 +01:00
parent fd9da72536
commit b1c247231b
33 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
websocket/client.go
View File

@ -73,13 +73,13 @@ func (c *Client) Listen() {
// Listen write request via chanel
func (c *Client) listenWrite() {
logger.Debugln("Listening write to client")
wslogger.Debugln("Listening write to client")
for {
select {
// send message to the client
case msg := <-c.ch:
logger.Debugln("Send:", msg)
wslogger.Debugln("Send:", msg)
ws.JSON.Send(c.ws, msg)
// receive done request
@ -93,7 +93,7 @@ func (c *Client) listenWrite() {
// Listen read request via chanel
func (c *Client) listenRead() {
logger.Debugln("Listening read from client")
wslogger.Debugln("Listening read from client")
for {
select {
@ -112,7 +112,7 @@ func (c *Client) listenRead() {
} else if err != nil {
c.server.Err(err)
} else {
logger.Debugln(&msg)
wslogger.Debugln(&msg)
if c.onMessage != nil {
c.onMessage(c, &msg)
}

14
websocket/server.go
View File

@ -3,12 +3,12 @@ package websocket
import (
"net/http"
"github.com/ethereum/go-ethereum/ethlog"
"github.com/ethereum/go-ethereum/logger"
ws "code.google.com/p/go.net/websocket"
)
var logger = ethlog.NewLogger("WS")
var wslogger = logger.NewLogger("WS")
// Chat server.
type Server struct {
@ -68,10 +68,10 @@ func (s *Server) Err(err error) {
}
func (s *Server) servHTTP() {
logger.Debugln("Serving http", s.httpServ)
wslogger.Debugln("Serving http", s.httpServ)
err := http.ListenAndServe(s.httpServ, nil)
logger.Warnln(err)
wslogger.Warnln(err)
}
func (s *Server) MessageFunc(f MsgFunc) {
@ -81,7 +81,7 @@ func (s *Server) MessageFunc(f MsgFunc) {
// Listen and serve.
// It serves client connection and broadcast request.
func (s *Server) Listen() {
logger.Debugln("Listening server...")
wslogger.Debugln("Listening server...")
// ws handler
onConnected := func(ws *ws.Conn) {
@ -102,7 +102,7 @@ func (s *Server) Listen() {
s := ws.Server{Handler: ws.Handler(onConnected)}
s.ServeHTTP(w, req)
})
logger.Debugln("Created handler")
wslogger.Debugln("Created handler")
go s.servHTTP()
@ -118,7 +118,7 @@ func (s *Server) Listen() {
delete(s.clients, c.id)
case err := <-s.errCh:
logger.Debugln("Error:", err.Error())
wslogger.Debugln("Error:", err.Error())
case <-s.doneCh:
return