diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-11-29 21:11:58 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-11-29 21:11:58 +0300 |
| commit | 44910273005ebabb949f442cd5c7c4c0b703dc0a (patch) | |
| tree | 7eff6b99fae47f77a6c62d9a5830326a86db8a14 /src | |
| parent | b907d34689879da7e9f2f4991d61e344a48cce30 (diff) | |
| parent | c2160877085bf4755cac3a2338695597c136523f (diff) | |
| download | rabbitmq-server-git-44910273005ebabb949f442cd5c7c4c0b703dc0a.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index daaab820c4..6221cf0b44 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -373,15 +373,16 @@ sd_open_port() -> use_stdio, out]). sd_notify_socat(Unit) -> - case sd_open_port() of - {'EXIT', Exit} -> - io:format(standard_error, "Failed to start socat ~p~n", [Exit]), - false; + try sd_open_port() of Port -> Port ! {self(), {command, sd_notify_data()}}, Result = sd_wait_activation(Port, Unit), port_close(Port), Result + catch + Class:Reason -> + io:format(standard_error, "Failed to start socat ~p:~p~n", [Class, Reason]), + false end. sd_current_unit() -> |