there can be more than one message on the socket; empty the queue when shutting down...

[saartuer.git] / tyshell

diff --git a/tyshell b/tyshell
index 0027698e3b44654549ff863ff86055c43e09e3e9..2df0a229b5069a4a4e292a9bcbaf87ccdff1906c 100755 (executable)
--- a/tyshell
+++ b/tyshell
@@ -7,6 +7,7 @@ import subprocess
 import socket
 import pwd
 import grp
 import socket
 import pwd
 import grp

+import traceback

 from collections import namedtuple
 
 tuerSock = "/run/tuer.sock"
 from collections import namedtuple
 
 tuerSock = "/run/tuer.sock"


@@ -42,9 +43,11 @@ def sendcmd(addr, cmd):
                s.connect(addr)
                s.settimeout(60.0)
                s.send(cmd.encode())
                s.connect(addr)
                s.settimeout(60.0)
                s.send(cmd.encode())

-               data = s.recv(256)
+               while True:
+                       data = s.recv(256)
+                       if not len(data): break
+                       print(data.decode('utf-8'))

                s.close()
                s.close()

-               print(data.decode('utf-8'))

        return run
 
 def exitcmd(c):
        return run
 
 def exitcmd(c):


@@ -104,6 +107,7 @@ while True:
                        if res: break
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))
                        if res: break
                except Exception as e:
                        print("Error while executing %s: %s" % (command[0], str(e)))

+                       #print(traceback.format_exc())

        else: # multiple commands fit the prefix
                print("Ambiguous command prefix, please choose one of the following:")
                print("\t", " ".join(cmdoptions))
        else: # multiple commands fit the prefix
                print("Ambiguous command prefix, please choose one of the following:")
                print("\t", " ".join(cmdoptions))