From 57f93d25bd9a09f4a68307342ad44a5af1d5dc26 Mon Sep 17 00:00:00 2001
From: Bas van Kervel <basvankervel@ziggo.nl>
Date: Thu, 16 Apr 2015 12:56:51 +0200
Subject: admin.stopRPC support added which stops the RPC HTTP listener

---
 rpc/http.go | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'rpc/http.go')

diff --git a/rpc/http.go b/rpc/http.go
index 790442a28..61f8da549 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
 
 	"github.com/ethereum/go-ethereum/logger"
@@ -15,6 +14,7 @@ import (
 )
 
 var rpclogger = logger.NewLogger("RPC")
+var rpclistener *ControllableTCPListener
 
 const (
 	jsonrpcver       = "2.0"
@@ -22,11 +22,17 @@ const (
 )
 
 func Start(pipe *xeth.XEth, config RpcConfig) error {
-	l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
+	if rpclistener != nil { // listener already running
+		glog.Infoln("RPC listener already running")
+		return fmt.Errorf("RPC already running on %s", rpclistener.Addr().String())
+	}
+
+	l, err := NewControllableTCPListener(fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
 	if err != nil {
 		rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err)
 		return err
 	}
+	rpclistener = l
 
 	var handler http.Handler
 	if len(config.CorsDomain) > 0 {
@@ -45,6 +51,17 @@ func Start(pipe *xeth.XEth, config RpcConfig) error {
 	return nil
 }
 
+func Stop() error {
+	if rpclistener == nil { // listener not running
+		glog.Infoln("RPC listener not running")
+		return nil
+	}
+
+	rpclistener.Stop()
+	rpclistener = nil
+	return nil
+}
+
 // JSONRPC returns a handler that implements the Ethereum JSON-RPC API.
 func JSONRPC(pipe *xeth.XEth) http.Handler {
 	api := NewEthereumApi(pipe)
-- 
cgit v1.2.3