redirect all stdio to regular worker log file

Nathan Marz · Nathan Marz · commit a6fcc6ed17f7 · 2012-01-05T03:43:12.000-08:00
diff --git a/src/clj/backtype/storm/daemon/worker.clj b/src/clj/backtype/storm/daemon/worker.clj
@@ -76,6 +76,8 @@
 (defserverfn mk-worker [conf mq-context storm-id supervisor-id port worker-id]
   (log-message "Launching worker for " storm-id " on " supervisor-id ":" port " with id " worker-id
                " and conf " conf)
+  (if-not (local-mode? conf)
+    (redirect-stdio-to-log4j!))
   (let [active (atom true)
         storm-active-atom (atom false)
         cluster-state (cluster/mk-distributed-cluster-state conf)
diff --git a/src/clj/backtype/storm/log.clj b/src/clj/backtype/storm/log.clj
@@ -15,3 +15,9 @@
 
 (defmacro log-warn [& args]
   `(log/warn (str ~@args)))
+
+(defn log-capture! [& args]
+  (apply log/log-capture! args))
+
+(defn log-stream [& args]
+  (apply log/log-stream args))
diff --git a/src/clj/backtype/storm/util.clj b/src/clj/backtype/storm/util.clj
@@ -13,7 +13,7 @@
   (:import [org.apache.commons.io FileUtils])
   (:import [org.apache.commons.exec ExecuteException])
   (:import [org.json.simple JSONValue])
-  (:import [java.util Timer])
+  (:import [clojure.lang RT])
   (:require [clojure.contrib [str-utils2 :as str]])
   (:require [clojure [set :as set]])
   (:use [clojure walk])
@@ -568,3 +568,13 @@
             (cond ~@guards
                   true (throw ~error-local)
                   )))))
+
+(defn redirect-stdio-to-log4j! []
+  ;; set-var-root doesn't work with *out* and *err*, so digging deeper here
+  (.set RT/OUT (java.io.OutputStreamWriter.
+                 (log-stream :info "STDIO")))
+  (.set RT/ERR (PrintWriter.
+                 (java.io.OutputStreamWriter.
+                   (log-stream :error "STDIO"))
+                   true))
+  (log-capture! "STDIO"))
