aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBas van Kervel <basvankervel@gmail.com>2015-06-25 21:54:16 +0800
committerBas van Kervel <basvankervel@gmail.com>2015-06-25 21:54:16 +0800
commit662285074e55a3915f7236a04fec355c3f416eb8 (patch)
tree87f24d50fa75351444a5992cb319cf565695b2a5
parent5757a0edb59f854433d11982b2ba4831cceb167e (diff)
downloaddexon-662285074e55a3915f7236a04fec355c3f416eb8.tar
dexon-662285074e55a3915f7236a04fec355c3f416eb8.tar.gz
dexon-662285074e55a3915f7236a04fec355c3f416eb8.tar.bz2
dexon-662285074e55a3915f7236a04fec355c3f416eb8.tar.lz
dexon-662285074e55a3915f7236a04fec355c3f416eb8.tar.xz
dexon-662285074e55a3915f7236a04fec355c3f416eb8.tar.zst
dexon-662285074e55a3915f7236a04fec355c3f416eb8.zip
improved logging for IPC connection lifetime management
-rw-r--r--rpc/comms/comms.go8
-rw-r--r--rpc/comms/ipc.go5
-rw-r--r--rpc/comms/ipc_unix.go5
-rw-r--r--rpc/comms/ipc_windows.go17
4 files changed, 23 insertions, 12 deletions
diff --git a/rpc/comms/comms.go b/rpc/comms/comms.go
index 1374bde3f..6e980149f 100644
--- a/rpc/comms/comms.go
+++ b/rpc/comms/comms.go
@@ -43,7 +43,7 @@ type EthereumClient interface {
SupportedModules() (map[string]string, error)
}
-func handle(conn net.Conn, api shared.EthereumApi, c codec.Codec) {
+func handle(id int, conn net.Conn, api shared.EthereumApi, c codec.Codec) {
codec := c.New(conn)
for {
@@ -52,8 +52,8 @@ func handle(conn net.Conn, api shared.EthereumApi, c codec.Codec) {
codec.Close()
return
} else if err != nil {
- glog.V(logger.Error).Infof("comms recv err - %v\n", err)
codec.Close()
+ glog.V(logger.Debug).Infof("Closed IPC Conn %06d recv err - %v\n", id, err)
return
}
@@ -71,8 +71,8 @@ func handle(conn net.Conn, api shared.EthereumApi, c codec.Codec) {
err = codec.WriteResponse(responses[:responseCount])
if err != nil {
- glog.V(logger.Error).Infof("comms send err - %v\n", err)
codec.Close()
+ glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err)
return
}
} else {
@@ -82,8 +82,8 @@ func handle(conn net.Conn, api shared.EthereumApi, c codec.Codec) {
rpcResponse = shared.NewRpcResponse(requests[0].Id, requests[0].Jsonrpc, res, err)
err = codec.WriteResponse(rpcResponse)
if err != nil {
- glog.V(logger.Error).Infof("comms send err - %v\n", err)
codec.Close()
+ glog.V(logger.Debug).Infof("Closed IPC Conn %06d send err - %v\n", id, err)
return
}
}
diff --git a/rpc/comms/ipc.go b/rpc/comms/ipc.go
index 3cfcbf3cf..f3dda5581 100644
--- a/rpc/comms/ipc.go
+++ b/rpc/comms/ipc.go
@@ -2,6 +2,7 @@ package comms
import (
"fmt"
+ "math/rand"
"net"
"encoding/json"
@@ -95,3 +96,7 @@ func NewIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
func StartIpc(cfg IpcConfig, codec codec.Codec, offeredApi shared.EthereumApi) error {
return startIpc(cfg, codec, offeredApi)
}
+
+func newIpcConnId() int {
+ return rand.Int() % 1000000
+}
diff --git a/rpc/comms/ipc_unix.go b/rpc/comms/ipc_unix.go
index 5724231f4..3e71c7d32 100644
--- a/rpc/comms/ipc_unix.go
+++ b/rpc/comms/ipc_unix.go
@@ -48,7 +48,10 @@ func startIpc(cfg IpcConfig, codec codec.Codec, api shared.EthereumApi) error {
continue
}
- go handle(conn, api, codec)
+ id := newIpcConnId()
+ glog.V(logger.Debug).Infof("New IPC connection with id %06d started\n", id)
+
+ go handle(id, conn, api, codec)
}
os.Remove(cfg.Endpoint)
diff --git a/rpc/comms/ipc_windows.go b/rpc/comms/ipc_windows.go
index 4914a99c4..203cd2d7b 100644
--- a/rpc/comms/ipc_windows.go
+++ b/rpc/comms/ipc_windows.go
@@ -667,13 +667,16 @@ func startIpc(cfg IpcConfig, codec codec.Codec, api shared.EthereumApi) error {
glog.V(logger.Error).Infof("Error accepting ipc connection - %v\n", err)
continue
}
-
- go handle(conn, api, codec)
- }
-
- os.Remove(cfg.Endpoint)
- }()
-
+
+ id := newIpcConnId()
+ glog.V(logger.Debug).Infof("New IPC connection with id %06d started\n", id)
+
+ go handle(id, conn, api, codec)
+ }
+
+ os.Remove(cfg.Endpoint)
+ }()
+
glog.V(logger.Info).Infof("IPC service started (%s)\n", cfg.Endpoint)
return nil