diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-01-27 11:53:27 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-01-27 11:53:27 +0100 |
| commit | e4c84b0d11cc733057c317b06b2eae6bebee4164 (patch) | |
| tree | 2fbe5d57e265b3fe4c1174c896abd524c57b8e14 | |
| parent | a99256990d1cc95cb542301430bebc94b32e73bd (diff) | |
| parent | 5dfd117a18355ae71b7ec7d389cc8e7a45516aa9 (diff) | |
| download | rabbitmq-server-git-e4c84b0d11cc733057c317b06b2eae6bebee4164.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit.erl | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 315955657c..def466701a 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -289,10 +289,14 @@ broker_start() -> Plugins = rabbit_plugins:setup(), ToBeLoaded = Plugins ++ ?APPS, start_apps(ToBeLoaded), - %% Only for systemd unit with Type=notify. Errors are intentionally - %% ignored: either you have working systemd-notify(1) or you don't - %% care about systemd at all. - os:cmd("systemd-notify --ready"), + case os:type() of + {win32, _} -> ok; + _ -> + %% Only for systemd unit with Type=notify. Errors are intentionally + %% ignored: either you have working systemd-notify(1) or you don't + %% care about systemd at all. + os:cmd("systemd-notify --ready") + end, ok = log_broker_started(rabbit_plugins:active()). start_it(StartFun) -> |