From 662285074e55a3915f7236a04fec355c3f416eb8 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@gmail.com>
Date: Thu, 25 Jun 2015 15:54:16 +0200
Subject: improved logging for IPC connection lifetime management

---
 rpc/comms/comms.go       |  8 ++++----
 rpc/comms/ipc.go         |  5 +++++
 rpc/comms/ipc_unix.go    |  5 ++++-
 rpc/comms/ipc_windows.go | 17 ++++++++++-------
 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
-- 
cgit v1.2.3