From a3633a98e48bd76b74016d171a7d32f86092cd47 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 28 Mar 2016 00:51:58 +0200 Subject: Unify --- rpc.go | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'rpc.go') diff --git a/rpc.go b/rpc.go index 57bfa73..f33456f 100644 --- a/rpc.go +++ b/rpc.go @@ -14,6 +14,13 @@ func Register(s *Server) { rpc.HandleHTTP() } +func DialRPC(server string) (*rpc.Client, error) { + if server == "" { + server = ":http-alt" + } + return rpc.DialHTTP("tcp", server) +} + // Add adds a new route (server) func (s *GoXY) Add(e Entry, _ *struct{}) error { log.Println("Add route", e) @@ -24,10 +31,7 @@ func (s *GoXY) Add(e Entry, _ *struct{}) error { // Add new entry (client) func Add(e Entry, server string) error { - if server == "" { - server = ":http-alt" - } - client, err := rpc.DialHTTP("tcp", server) + client, err := DialRPC(server) if err != nil { return err } @@ -45,10 +49,7 @@ func (s *GoXY) Del(serverName string, _ *struct{}) error { // Del removes a route (client) func Del(serverName string, server string) error { - if server == "" { - server = ":http-alt" - } - client, err := rpc.DialHTTP("tcp", server) + client, err := DialRPC(server) if err != nil { return err } @@ -62,10 +63,7 @@ func (s *GoXY) Get(serverName string, e *Entry) error { } func Get(serverName string, server string) (Entry, error) { - if server == "" { - server = ":http-alt" - } - client, err := rpc.DialHTTP("tcp", server) + client, err := DialRPC(server) if err != nil { return Entry{}, err } @@ -82,10 +80,7 @@ func (s GoXY) List(_ struct{}, r *Route) error { } func List(server string) (Route, error) { - if server == "" { - server = ":http-alt" - } - client, err := rpc.DialHTTP("tcp", server) + client, err := DialRPC(server) if err != nil { return nil, err } -- cgit v1.2.3