X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=sztool;h=efd483736216fa27db35b5d64bd0c749fa8168bf;hb=7d3504346fbb096ed88528e3c1355417577f8d86;hp=2dd723b7b9e73cb6de62638a5c358f3d397f6f78;hpb=f926c413dcb4d6071485c0d9d7068d2af79e98a1;p=remote-debug.git

diff --git a/sztool b/sztool
index 2dd723b..efd4837 100755
--- a/sztool
+++ b/sztool
@@ -15,21 +15,20 @@ URI = 'debug@autossh.suanzi.ai'
 
 def get_all_connected(host, port, user, password):
     command = 'sshpass -p' + password + ' ssh -q -o "StrictHostKeyChecking=no"  -o "UserKnownHostsFile /dev/null" ' + user + '@' + host + '  netstat -tn | grep ' + str(port) + ' | grep ESTABLISHED | wc -l'
-    print command
     output = check_output(shlex.split(command), shell=False)
     return int(output)
 
 def on_connect(client, userdata, flags, rc):
     client.subscribe(userdata['id'])
-    print "Connected with result code " + str(rc)
+    print "Connected with result code " + str(rc) +'\n'
     if userdata['action'] == 'connect':
         payload = {'from':userdata['id'], 'type':'request', 'command':'ssh'}
         client.publish(userdata['to'], str(payload))
     elif userdata['action'] == 'list':
-        #timer = threading.Timer(20, timeout)
-        #timer.start()
         payload = {'from':userdata['id'], 'type':'request', 'command':'list'}
         client.publish(userdata['to'], str(payload))
+        print'{0}\t\t{1}'.format(' Device ID ', 'Data')
+        print '-' * 30
 
 def on_message(client, userdata, msg):
 #    print('Receive topic:' + msg.topic + ' payload: ' +str(msg.payload))
@@ -42,7 +41,7 @@ def on_message(client, userdata, msg):
             client.disconnect()
             sys.exit(0)
         elif payload['command'] == 'list':
-            print payload['from'], payload['data']
+            print '{0}\t\t{1}'.format(payload['from'], payload['data'])
             client.total = client.total - 1
             if client.total == 0:
                 client.disconnect()
@@ -52,12 +51,6 @@ def get_mac_str():
     mac = hex(get_mac())
     return '{:0>12}'.format(mac[2:-1])
 
-#def timeout():
-#    print 'timeout'
-#    client.disconnect()
-#    sys.exit(0)
-#
-
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Choose an avaiable port and run ssh.', add_help=False)
     parser.add_argument('--help', action='help')