added line breaks for pcu hints,

added clearer message for catching exception strings.

diff --git a/pcucontrol/reboot.py b/pcucontrol/reboot.py
index f47da2e..5744141 100755 (executable)
--- a/pcucontrol/reboot.py
+++ b/pcucontrol/reboot.py
@@ -393,7 +393,8 @@ def reboot_api(node, pcu):
                        rb_ret =  "No modelname in PCU record."
                # TODO: how to handle the weird, georgetown pcus, the drac faults, and ilo faults
        except Exception, err:
-               rb_ret = str(err)
+               rb_ret = "Exception Model(%s): " % modelname 
+               rb_ret += str(err)
 
        return rb_ret
 

diff --git a/web/MonitorWeb/monitorweb/templates/pcuview.kid b/web/MonitorWeb/monitorweb/templates/pcuview.kid
index 5bf82b8..9740ea0 100644 (file)
--- a/web/MonitorWeb/monitorweb/templates/pcuview.kid
+++ b/web/MonitorWeb/monitorweb/templates/pcuview.kid
@@ -202,12 +202,15 @@ from links import *
                                        <span class="code" py:if="port == 22 and state == 'open'">
                                                ssh -o PasswordAuthentication=yes -o PubkeyAuthentication=no 
                                                ${pcu.plc_pcu_stats['username']}@${pcu_name(pcu.plc_pcu_stats)}
+                                               <br/>
                                        </span>
                                        <span class="code" py:if="port == 23 and state == 'open'">
                                                telnet ${pcu_name(pcu.plc_pcu_stats)}
+                                               <br/>
                                        </span>
                                        <span class="code" py:if="port == 80 and state == 'open'">
                                                <a href="http://${pcu_name(pcu.plc_pcu_stats)}">http://${pcu_name(pcu.plc_pcu_stats)}</a>
+                                               <br/>
                                        </span>
                                        <span class="code" py:if="port == 443 and state == 'open'">
                                                <br/>