diff options
| author | Hubert Plociniczak <hubert@lshift.net> | 2008-12-01 23:12:44 +0000 |
|---|---|---|
| committer | Hubert Plociniczak <hubert@lshift.net> | 2008-12-01 23:12:44 +0000 |
| commit | 4029615d25b0b6160eab6a61cd09d2e8e6c98e89 (patch) | |
| tree | d9d8611ef1085414e01ae989e94e3e394b2422a2 | |
| parent | 3385d74c2c1cbbca9e206013fead8528906fa35f (diff) | |
| parent | 30c9d45c4461c9d7f00ac2634f879d5e52dc8137 (diff) | |
| download | rabbitmq-server-git-4029615d25b0b6160eab6a61cd09d2e8e6c98e89.tar.gz | |
Merge bug19910 into default
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_multi.erl | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index b082841ea8..b821fa0dfa 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 c1c643d3a4..3c67d225da 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). @@ -98,6 +99,7 @@ 'ok' | 'aborted'). -spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}). -spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}). +-spec(format_stderr/2 :: (string(), [any()]) -> 'true'). -endif. @@ -369,3 +371,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 aa780ad578..b99dfbc1c1 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}. |