Skip to content
Snippets Groups Projects
Commit 09cd67bf authored by Karen Feng's avatar Karen Feng
Browse files

Changed bootstrap colors, fixed logpaging buttons

parent 8aee1182
No related branches found
No related tags found
No related merge requests found
Source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -37,7 +37,7 @@ import spark.ui.UIUtils
*/
private[spark]
class WorkerWebUI(val worker: Worker, val workDir: File, requestedPort: Option[Int] = None)
extends Logging {
extends Logging {
implicit val timeout = Timeout(
Duration.create(System.getProperty("spark.akka.askTimeout", "10").toLong, "seconds"))
val host = Utils.localHostName()
......@@ -111,23 +111,31 @@ class WorkerWebUI(val worker: Worker, val workDir: File, requestedPort: Option[I
if (startByte > 0) {
<a href={"?appId=%s&executorId=%s&logType=%s&offset=%s&byteLength=%s"
.format(appId, executorId, logType, math.max(startByte-byteLength, 0),
byteLength)}>
<button>Previous {Utils.memoryBytesToString(math.min(byteLength, startByte))}</button>
byteLength)}>
<button type="button" class="btn btn-default">
Previous {Utils.memoryBytesToString(math.min(byteLength, startByte))}
</button>
</a>
}
else {
<button disabled="disabled">Previous 0 B</button>
<button type="button" class="btn btn-default" disabled="disabled">
Previous 0 B
</button>
}
val nextButton =
if (endByte < logLength) {
<a href={"?appId=%s&executorId=%s&logType=%s&offset=%s&byteLength=%s".
format(appId, executorId, logType, endByte, byteLength)}>
<button>Next {Utils.memoryBytesToString(math.min(byteLength, logLength-endByte))}</button>
<button type="button" class="btn btn-default">
Next {Utils.memoryBytesToString(math.min(byteLength, logLength-endByte))}
</button>
</a>
}
else {
<button disabled="disabled">Next 0 B</button>
<button type="button" class="btn btn-default" disabled="disabled">
Next 0 B
</button>
}
val content =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment