fix session list relative links in TrainModule and ArbiterModule; fix auto-attach in ArbiterModule at arbiter/sid
Signed-off-by: Tamás Fenyvesi <tamas.fenyvesi@doknet.hu>master
parent
8f55214d1b
commit
cf11c2394a
|
@ -141,9 +141,15 @@ public class ArbiterModule implements UIModule {
|
||||||
(path, rc) -> rc.response().end(multiSession ? "true" : "false")));
|
(path, rc) -> rc.response().end(multiSession ? "true" : "false")));
|
||||||
if (multiSession) {
|
if (multiSession) {
|
||||||
r.add(new Route("/arbiter", HttpMethod.GET, (path, rc) -> this.listSessions(rc)));
|
r.add(new Route("/arbiter", HttpMethod.GET, (path, rc) -> this.listSessions(rc)));
|
||||||
r.add(new Route("/arbiter/:sessionId", HttpMethod.GET, (path, rc) -> rc.response()
|
r.add(new Route("/arbiter/:sessionId", HttpMethod.GET, (path, rc) -> {
|
||||||
.putHeader("content-type", "text/html; charset=utf-8")
|
if (knownSessionIDs.containsKey(path.get(0))) {
|
||||||
.sendFile("templates/ArbiterUI.html")));
|
rc.response()
|
||||||
|
.putHeader("content-type", "text/html; charset=utf-8")
|
||||||
|
.sendFile("templates/ArbiterUI.html");
|
||||||
|
} else {
|
||||||
|
sessionNotFound(path.get(0), rc.request().path(), rc);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
r.add(new Route("/arbiter/:sessionId/lastUpdate", HttpMethod.GET, (path, rc) -> {
|
r.add(new Route("/arbiter/:sessionId/lastUpdate", HttpMethod.GET, (path, rc) -> {
|
||||||
if (knownSessionIDs.containsKey(path.get(0))) {
|
if (knownSessionIDs.containsKey(path.get(0))) {
|
||||||
|
@ -243,7 +249,7 @@ public class ArbiterModule implements UIModule {
|
||||||
if (!knownSessionIDs.isEmpty()) {
|
if (!knownSessionIDs.isEmpty()) {
|
||||||
sb.append(" <ul>");
|
sb.append(" <ul>");
|
||||||
for (String sessionId : knownSessionIDs.keySet()) {
|
for (String sessionId : knownSessionIDs.keySet()) {
|
||||||
sb.append(" <li><a href=\"arbiter/")
|
sb.append(" <li><a href=\"/arbiter/")
|
||||||
.append(sessionId).append("\">")
|
.append(sessionId).append("\">")
|
||||||
.append(sessionId).append("</a></li>\n");
|
.append(sessionId).append("</a></li>\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -246,7 +246,7 @@ public class TrainModule implements UIModule {
|
||||||
if (!knownSessionIDs.isEmpty()) {
|
if (!knownSessionIDs.isEmpty()) {
|
||||||
sb.append(" <ul>");
|
sb.append(" <ul>");
|
||||||
for (String sessionId : knownSessionIDs.keySet()) {
|
for (String sessionId : knownSessionIDs.keySet()) {
|
||||||
sb.append(" <li><a href=\"train/")
|
sb.append(" <li><a href=\"/train/")
|
||||||
.append(sessionId).append("\">")
|
.append(sessionId).append("\">")
|
||||||
.append(sessionId).append("</a></li>\n");
|
.append(sessionId).append("</a></li>\n");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue