From d1bf8a60dcea5614d42a15546e98da9fe9324568 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Mon, 26 Feb 2018 16:25:40 +0100 Subject: [PATCH] Refactor of the explorerURL --- blockbook.go | 4 ++-- server/socketio.go | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/blockbook.go b/blockbook.go index fcf300f9..c209e208 100644 --- a/blockbook.go +++ b/blockbook.go @@ -62,7 +62,7 @@ var ( zeroMQBinding = flag.String("zeromq", "", "binding to zeromq, if missing no zeromq connection") - insightWeb = flag.String("insight", "", "address of the insight Bitcoin blockchain explorer") + explorerURL = flag.String("explorer", "", "address of the Bitcoin blockchain explorer") ) var ( @@ -159,7 +159,7 @@ func main() { var socketIoServer *server.SocketIoServer if *socketIoBinding != "" { - socketIoServer, err = server.NewSocketIoServer(*socketIoBinding, *certFiles, index, mempool, chain, *insightWeb) + socketIoServer, err = server.NewSocketIoServer(*socketIoBinding, *certFiles, index, mempool, chain, *explorerURL) if err != nil { glog.Fatal("socketio: ", err) } diff --git a/server/socketio.go b/server/socketio.go index 3dfd4ff6..c9f2fc11 100644 --- a/server/socketio.go +++ b/server/socketio.go @@ -17,18 +17,18 @@ import ( // SocketIoServer is handle to SocketIoServer type SocketIoServer struct { - binding string - certFiles string - server *gosocketio.Server - https *http.Server - db *db.RocksDB - mempool *bchain.Mempool - chain *bchain.BitcoinRPC - insightWeb string + binding string + certFiles string + server *gosocketio.Server + https *http.Server + db *db.RocksDB + mempool *bchain.Mempool + chain *bchain.BitcoinRPC + explorerURL string } // NewSocketIoServer creates new SocketIo interface to blockbook and returns its handle -func NewSocketIoServer(binding string, certFiles string, db *db.RocksDB, mempool *bchain.Mempool, chain *bchain.BitcoinRPC, insightWeb string) (*SocketIoServer, error) { +func NewSocketIoServer(binding string, certFiles string, db *db.RocksDB, mempool *bchain.Mempool, chain *bchain.BitcoinRPC, explorerURL string) (*SocketIoServer, error) { server := gosocketio.NewServer(transport.GetDefaultWebsocketTransport()) server.On(gosocketio.OnConnection, func(c *gosocketio.Channel) { @@ -56,14 +56,14 @@ func NewSocketIoServer(binding string, certFiles string, db *db.RocksDB, mempool } s := &SocketIoServer{ - binding: binding, - certFiles: certFiles, - https: https, - server: server, - db: db, - mempool: mempool, - chain: chain, - insightWeb: insightWeb, + binding: binding, + certFiles: certFiles, + https: https, + server: server, + db: db, + mempool: mempool, + chain: chain, + explorerURL: explorerURL, } // support for tests of socket.io interface @@ -110,8 +110,8 @@ func (s *SocketIoServer) Shutdown(ctx context.Context) error { } func (s *SocketIoServer) txRedirect(w http.ResponseWriter, r *http.Request) { - if s.insightWeb != "" { - http.Redirect(w, r, s.insightWeb+r.URL.Path, 302) + if s.explorerURL != "" { + http.Redirect(w, r, s.explorerURL+r.URL.Path, 302) } }