You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/09/28 07:21:42 UTC
[8/9] storm git commit: Merge branch 'STORM-2758' of
https://github.com/Ethanlm/storm into STORM-2758-merge
Merge branch 'STORM-2758' of https://github.com/Ethanlm/storm into STORM-2758-merge
* fixed merge conflict by Jungtaek Lim <ka...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/99969a5b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/99969a5b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/99969a5b
Branch: refs/heads/master
Commit: 99969a5bf259c3fd0dc3ee12cc5380ed87896d18
Parents: ddea2ac ec77f66
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Sep 28 16:19:48 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Sep 28 16:19:48 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/storm/daemon/logviewer/LogviewerServer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/99969a5b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
----------------------------------------------------------------------
diff --cc storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java
index 87e7925,5bceb21..77f939f
--- 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
@@@ -54,8 -54,9 +54,9 @@@ import org.slf4j.LoggerFactory
*/
public class LogviewerServer implements AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(LogviewerServer.class);
- private static final Meter meterShutdownCalls = StormMetricsRegistry.registerMeter("drpc:num-shutdown-calls");
+ private static final Meter meterShutdownCalls = StormMetricsRegistry.registerMeter("logviewer:num-shutdown-calls");
- public static final String STATIC_RESOURCE_DIRECTORY_PATH = "./public";
+ private static final String stormHome = System.getProperty("storm.home");
+ public static final String STATIC_RESOURCE_DIRECTORY_PATH = stormHome + "/public";
private static Server mkHttpServer(Map<String, Object> conf) {
Integer logviewerHttpPort = (Integer) conf.get(DaemonConfig.LOGVIEWER_PORT);