You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/07/24 17:10:07 UTC
[14/19] storm git commit: STORM-1280 port
backtype.storm.daemon.logviewer to java
STORM-1280 port backtype.storm.daemon.logviewer to java
* addressed received review comments so far
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f9ed5d43
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f9ed5d43
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f9ed5d43
Branch: refs/heads/master
Commit: f9ed5d432ce433de7d2f7b475bf77e02ef563341
Parents: 6a041a9
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Jul 20 12:16:59 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Jul 20 12:16:59 2017 +0900
----------------------------------------------------------------------
.../apache/storm/daemon/logviewer/LogviewerServer.java | 10 ----------
.../daemon/logviewer/handler/LogviewerLogPageHandler.java | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/f9ed5d43/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
index 4f9834d..0802015 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
@@ -80,7 +80,6 @@ public class LogviewerServer implements AutoCloseable {
final Boolean httpsWantClientAuth = (Boolean) (conf.get(DaemonConfig.LOGVIEWER_HTTPS_WANT_CLIENT_AUTH));
final Boolean httpsNeedClientAuth = (Boolean) (conf.get(DaemonConfig.LOGVIEWER_HTTPS_NEED_CLIENT_AUTH));
- //TODO a better way to do this would be great.
LogviewerApplication.setup(conf);
ret = UIHelpers.jettyCreateServer(logviewerHttpPort, null, httpsPort);
@@ -150,15 +149,6 @@ public class LogviewerServer implements AutoCloseable {
}
/**
- * @return The port the HTTP server is listening on. Not available until {@link #start() } has run.
- */
- public int getHttpServerPort() {
- assert httpServer.getConnectors().length == 1;
-
- return httpServer.getConnectors()[0].getLocalPort();
- }
-
- /**
* Main method to start the server.
*/
public static void main(String [] args) throws Exception {
http://git-wip-us.apache.org/repos/asf/storm/blob/f9ed5d43/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java
index 04b1a13..47fa4b3 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogPageHandler.java
@@ -132,7 +132,7 @@ public class LogviewerLogPageHandler {
if (port == null) {
fileResults = new ArrayList<>();
- File topoDir = new File(logRoot + Utils.FILE_PATH_SEPARATOR + topologyId);
+ File topoDir = new File(logRoot, topologyId);
if (topoDir.exists()) {
File[] topoDirFiles = topoDir.listFiles();
if (topoDirFiles != null) {