From 5565426b59647b36ec9f5e182ffb32f6fb535c71 Mon Sep 17 00:00:00 2001
From: Marc Aymerich <glicerinu@gmail.com>
Date: Thu, 4 Feb 2016 12:13:39 +0000
Subject: [PATCH] Added orchestration.Server remote status retrieval

---
 orchestra/contrib/orchestration/utils.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/orchestra/contrib/orchestration/utils.py b/orchestra/contrib/orchestration/utils.py
index cf227260..9257e801 100644
--- a/orchestra/contrib/orchestration/utils.py
+++ b/orchestra/contrib/orchestration/utils.py
@@ -18,14 +18,15 @@ def retrieve_state(servers):
         if ping.startswith('rtt'):
             ping = '%s ms' % ping.split('/')[4]
         else:
-            ping = '<span style="color:red"><b>offline<b></span>'
+            ping = '<span style="color:red"><b>Offline<b></span>'
         
         uptime = join(uptime, silent=True)
+        uptime_stderr = uptime.stderr.decode()
         uptime = uptime.stdout.decode().split()
         if uptime:
             uptime = 'Up %s %s load %s %s %s' % (uptime[2], uptime[3], uptime[-3], uptime[-2], uptime[-1])
         else:
-            uptime = '<span style="color:red"><b>Timeout<b></span>'
+            uptime = '<span style="color:red"><b>%s<b></span>' % uptime_stderr
         state[server.pk] = (ping, uptime)
     
     return state