diff options
| author | Matthias Radestock <matthias@lshift.net> | 2008-11-30 13:50:29 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2008-11-30 13:50:29 +0000 |
| commit | f893883ffa7404f771b67727440bbf40b03fd4c9 (patch) | |
| tree | ada5cc12fad37f074aa8c3092d2ddda2275ac6b2 | |
| parent | 484e1ab80b4624fae94749a33dd1ed03b15446c9 (diff) | |
| parent | 32e7bc18f8002f1f6bd4b348d397afe9d7b25642 (diff) | |
| download | rabbitmq-server-f893883ffa7404f771b67727440bbf40b03fd4c9.tar.gz | |
merge bug19912 into bug19910
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 392818b3..40ceadff 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -67,7 +67,7 @@ start() -> end. error(Format, Args) -> - io:format("Error: " ++ Format ++"~n", Args). + rabbit_misc:format_stderr("Error: " ++ Format ++"~n", Args). parse_args(["-n", NodeS | Args], Params) -> Node = case lists:member($@, NodeS) of diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index c1c643d3..8e852431 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -43,6 +43,7 @@ -export([guid/0, string_guid/1, binstring_guid/1]). -export([dirty_read_all/1, dirty_foreach_key/2, dirty_dump_log/1]). -export([append_file/2]). +-export([format_stderr/2]). -import(mnesia). -import(lists). @@ -369,3 +370,8 @@ append_file(File, _, Suffix) -> {ok, Data} -> file:write_file([File, Suffix], Data, [append]); Error -> Error end. + +format_stderr(Fmt, Args) -> + Port = open_port({fd, 0, 2}, [out]), + port_command(Port, io_lib:format(Fmt, Args)), + port_close(Port). diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index e2dffa29..316c41a5 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -60,7 +60,7 @@ start() -> end. error(Format, Args) -> - io:format("Error: " ++ Format ++"~n", Args). + rabbit_misc:format_stderr("Error: " ++ Format ++"~n", Args). parse_args([Command | Args]) -> {list_to_atom(Command), Args}. |