You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by je...@apache.org on 2016/02/12 16:14:56 UTC
[2/3] storm git commit: Fixing other exceptions.
Fixing other exceptions.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d3d0a868
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d3d0a868
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d3d0a868
Branch: refs/heads/master
Commit: d3d0a868069ff783ba25d9698ff4b9311e58d796
Parents: 747080e
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Feb 11 16:30:09 2016 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Feb 11 16:30:09 2016 -0600
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 2 +-
storm-core/src/jvm/org/apache/storm/utils/Utils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d3d0a868/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index 7af2cf0..ae9e92f 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -1051,7 +1051,7 @@
(log-message "Creating symlinks for worker-id: " worker-id " storm-id: "
storm-id " to its port artifacts directory")
(if (.exists (File. worker-dir))
- (Utils/createSymlink worker-dir topo-dir "artifacts" port))))
+ (Utils/createSymlink worker-dir topo-dir "artifacts" (str port)))))
(defmethod launch-worker
:distributed [supervisor storm-id port worker-id mem-onheap]
http://git-wip-us.apache.org/repos/asf/storm/blob/d3d0a868/storm-core/src/jvm/org/apache/storm/utils/Utils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/utils/Utils.java b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
index 4ec1792..a0c0b1a 100644
--- a/storm-core/src/jvm/org/apache/storm/utils/Utils.java
+++ b/storm-core/src/jvm/org/apache/storm/utils/Utils.java
@@ -1557,11 +1557,11 @@ public class Utils {
return null;
}
- public static String logsFilename(String stormId, int port) {
+ public static String logsFilename(String stormId, String port) {
return stormId + FILE_PATH_SEPARATOR + port + FILE_PATH_SEPARATOR + "worker.log";
}
- public static String eventLogsFilename(String stormId, int port) {
+ public static String eventLogsFilename(String stormId, String port) {
return stormId + FILE_PATH_SEPARATOR + port + FILE_PATH_SEPARATOR + "events.log";
}