ctrl: cosmetic cleanup
* remove unused function * move internal function call outside of main Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da
This commit is contained in:
parent
a07e55335d
commit
217837cf55
|
@ -38,6 +38,7 @@ def connect(host, port):
|
||||||
return sck
|
return sck
|
||||||
|
|
||||||
def do_set_get(sck, var, value = None):
|
def do_set_get(sck, var, value = None):
|
||||||
|
_leftovers(sck, socket.MSG_DONTWAIT)
|
||||||
(r, c) = Ctrl().cmd(var, value)
|
(r, c) = Ctrl().cmd(var, value)
|
||||||
sck.send(c)
|
sck.send(c)
|
||||||
ret = sck.recv(4096)
|
ret = sck.recv(4096)
|
||||||
|
@ -47,10 +48,6 @@ def set_var(sck, var, val):
|
||||||
(a, _, _) = do_set_get(sck, var, val)
|
(a, _, _) = do_set_get(sck, var, val)
|
||||||
return a
|
return a
|
||||||
|
|
||||||
def get_var(sck, var):
|
|
||||||
(_, _, v) = do_set_get(sck, var)
|
|
||||||
return v
|
|
||||||
|
|
||||||
def _leftovers(sck, fl):
|
def _leftovers(sck, fl):
|
||||||
"""
|
"""
|
||||||
Read outstanding data if any according to flags
|
Read outstanding data if any according to flags
|
||||||
|
@ -102,13 +99,11 @@ if __name__ == '__main__':
|
||||||
if options.cmd_set:
|
if options.cmd_set:
|
||||||
if len(args) < 2:
|
if len(args) < 2:
|
||||||
parser.error("Set requires var and value arguments")
|
parser.error("Set requires var and value arguments")
|
||||||
_leftovers(sock, socket.MSG_DONTWAIT)
|
|
||||||
print("Got message:", set_var(sock, args[0], ' '.join(args[1:])))
|
print("Got message:", set_var(sock, args[0], ' '.join(args[1:])))
|
||||||
|
|
||||||
if options.cmd_get:
|
if options.cmd_get:
|
||||||
if len(args) != 1:
|
if len(args) != 1:
|
||||||
parser.error("Get requires the var argument")
|
parser.error("Get requires the var argument")
|
||||||
_leftovers(sock, socket.MSG_DONTWAIT)
|
|
||||||
(a, _, _) = do_set_get(sock, args[0])
|
(a, _, _) = do_set_get(sock, args[0])
|
||||||
print("Got message:", a)
|
print("Got message:", a)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue