Commit 3142d978 authored by Karol Latecki's avatar Karol Latecki Committed by Daniel Verkamp
Browse files

scripts/rpc.py: Handle socket connection error 



Handle socket exception, print it and exit cleanly.

Change-Id: I7ac899dfe329c7512339549991abea8a6cb09608
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/407308


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
parent b066126b

scripts/rpc.py

+5 −1
Original line number Diff line number Diff line
@@ -932,5 +932,9 @@ if __name__ == "__main__": 


    args = parser.parse_args()



    try:

        args.client = rpc.client.JSONRPCClient(args.server_addr, args.port, args.verbose, args.timeout)

    except JSONRPCException as ex:

        print(ex.message)

        exit(1)

    args.func(args)

scripts/rpc/client.py

+15 −11
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ class JSONRPCClient(object): 
    def __init__(self, addr, port=None, verbose=False, timeout=60.0):

        self.verbose = verbose

        self.timeout = timeout

        try:

            if addr.startswith('/'):

                self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)

                self.sock.connect(addr)
@@ -27,6 +28,9 @@ class JSONRPCClient(object): 
            else:

                self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

                self.sock.connect((addr, port))

        except socket.error as ex:

            raise JSONRPCException("Error while connecting to %s\n"

                                   "Error details: %s" % (addr, ex))



    def __del__(self):

        self.sock.close()