You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 05:23:53 UTC

svn commit: r1131567 - in /incubator/mesos/trunk/src/webui: master/webui.py slave/webui.py

Author: benh
Date: Sun Jun  5 03:23:53 2011
New Revision: 1131567

URL: http://svn.apache.org/viewvc?rev=1131567&view=rev
Log:
Must run nexus-foo from ./src - third_party already has bottle
Revert "Fixup bottle TEMPLATE_PATH and get ui working again."

This reverts commit 2768a519d78559dcbe97448f92d31568d2bfda8b.

Modified:
    incubator/mesos/trunk/src/webui/master/webui.py
    incubator/mesos/trunk/src/webui/slave/webui.py

Modified: incubator/mesos/trunk/src/webui/master/webui.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/master/webui.py?rev=1131567&r1=1131566&r2=1131567&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/master/webui.py (original)
+++ incubator/mesos/trunk/src/webui/master/webui.py Sun Jun  5 03:23:53 2011
@@ -36,5 +36,5 @@ def log_tail(level, lines):
   return commands.getoutput('tail -%s /tmp/nexus-master.%s' % (lines, level))
 
 
-bottle.TEMPLATE_PATH.append('./webui/master/')
+bottle.TEMPLATE_PATH.append('./webui/master/%s.tpl')
 bottle.run(host = '0.0.0.0', port = 8080)

Modified: incubator/mesos/trunk/src/webui/slave/webui.py
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/webui/slave/webui.py?rev=1131567&r1=1131566&r2=1131567&view=diff
==============================================================================
--- incubator/mesos/trunk/src/webui/slave/webui.py (original)
+++ incubator/mesos/trunk/src/webui/slave/webui.py Sun Jun  5 03:23:53 2011
@@ -59,5 +59,5 @@ def framework_log_tail(fid, log_type, li
     abort(403, 'Slave not yet registered with master')
 
 
-bottle.TEMPLATE_PATH.append('./webui/slave/')
+bottle.TEMPLATE_PATH.append('./webui/slave/%s.tpl')
 bottle.run(host = '0.0.0.0', port = 8081)