Merge branch 'STORM-2716' of https://github.com/srdo/storm into STORM-2716-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/70d8ba9d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/70d8ba9d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/70d8ba9d Branch: refs/heads/master Commit: 70d8ba9d5832c1893351dcfd0e285d287f221794 Parents: d304dd5 370a631 Author: Jungtaek Lim <[email protected]> Authored: Mon Oct 9 10:15:17 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Oct 9 10:15:17 2017 +0900 ---------------------------------------------------------------------- .gitattributes | 2 + .../src/jvm/org/apache/storm/utils/Utils.java | 1 - storm-core/src/clj/org/apache/storm/ui/core.clj | 10 +-- .../jvm/org/apache/storm/utils/WebAppUtils.java | 8 +- .../storm/daemon/supervisor/BasicContainer.java | 16 ++-- .../apache/storm/localizer/AsyncLocalizer.java | 4 +- .../org/apache/storm/utils/ServerUtils.java | 8 +- storm-webapp/pom.xml | 2 +- .../handler/LogviewerLogSearchHandler.java | 68 ++++++-------- .../handler/LogviewerProfileHandler.java | 8 +- .../logviewer/utils/LogFileDownloader.java | 2 +- .../daemon/logviewer/utils/WorkerLogs.java | 6 +- .../org/apache/storm/daemon/utils/PathUtil.java | 39 ++++++++ .../apache/storm/daemon/utils/UrlBuilder.java | 16 +++- .../handler/LogviewerLogSearchHandlerTest.java | 95 ++++++++++++-------- storm-webapp/src/test/resources/log4j2.xml | 32 +++++++ 16 files changed, 203 insertions(+), 114 deletions(-) ----------------------------------------------------------------------
