Permalink
Browse files

Logging UI fixes.

git-svn-id: https://svn.apache.org/repos/asf/incubator/mesos/trunk@1307037 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 941c7c0 commit 211ec6263fbcbdf5217b02db3db81e22d751696d @benh benh committed Mar 29, 2012
@@ -21,12 +21,8 @@
MESOS_WEBUI_DIR=@abs_top_srcdir@/src/webui
MESOS_LAUNCHER_DIR=@abs_top_builddir@/src
-MESOS_LOG_DIR=${MESOS_LOG_DIR:-/var/tmp/mesos-dev-logs}
-MESOS_WORK_DIR=${MESOS_WORK_DIR:-/var/tmp/mesos-dev-work}
MESOS_KILLTREE=@abs_top_srcdir@/src/scripts/killtree.sh
export MESOS_WEBUI_DIR
export MESOS_LAUNCHER_DIR
-export MESOS_LOG_DIR
-export MESOS_WORK_DIR
export MESOS_KILLTREE
@@ -69,7 +69,7 @@ void Logging::init(const char* programName, const Configuration& conf)
google::SetStderrLogging(google::INFO);
}
- LOG(INFO) << "Logging to " << FLAGS_logtostderr ? "<stderr>" : FLAGS_log_dir;
+ LOG(INFO) << "Logging to " << (FLAGS_logtostderr ? "<stderr>" : FLAGS_log_dir);
}
@@ -80,8 +80,12 @@
<p>
Log:
+% if log_dir != "":
<a href="/log/INFO/100">[last 100 lines]</a>
<a href="/log/INFO">[full]</a>
+% else:
+ Logging to a file is not enabled, please set the 'log_dir' option.
+% end
</p>
<h2>Resources</h2>
@@ -48,7 +48,7 @@
@route('/')
def index():
bottle.TEMPLATES.clear() # For rapid development
- return template("index", master_port = master_port)
+ return template("index", master_port = master_port, log_dir = log_dir)
@route('/framework/:id#[0-9-]*#')
@@ -42,8 +42,12 @@
<p>
Log:
+% if log_dir != "":
<a href="/log/INFO/100">[last 100 lines]</a>
<a href="/log/INFO">[full]</a>
+% else:
+ Logging to a file is not enabled, please set the 'log_dir' option.
+% end
</p>
<h2>Frameworks</h2>
@@ -54,7 +54,7 @@
@route('/')
def index():
bottle.TEMPLATES.clear() # For rapid development
- return template("index", slave_port = slave_port)
+ return template("index", slave_port = slave_port, log_dir = log_dir)
@route('/framework/:id#.*#')

0 comments on commit 211ec62

Please sign in to comment.