From 173c4556c84a4dfbf9bfbb702b57cddebfe033e5 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Fri, 29 Jun 2018 15:04:19 +0800 Subject: [PATCH] format the output --- sztool | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sztool b/sztool index 2dd723b..0c4fd7c 100755 --- a/sztool +++ b/sztool @@ -15,13 +15,13 @@ 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 + #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)) @@ -30,6 +30,9 @@ def on_connect(client, userdata, flags, rc): #timer.start() payload = {'from':userdata['id'], 'type':'request', 'command':'list'} client.publish(userdata['to'], str(payload)) + #print '-' * 30 + 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 +45,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() -- 2.11.0