diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-02-15 00:05:49 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-02-15 00:05:49 +0300 |
| commit | c9b80faab8a99139bcac047f630be3ce28a508a6 (patch) | |
| tree | 61e3f17d359736224036f69335ffdcc0e6ee944a /src | |
| parent | e01aff8c523fe74b3a1f6c8a755376b05d3e4abf (diff) | |
| parent | 82748534acce4a9c6cf05400e1c7bed3320a6d07 (diff) | |
| download | rabbitmq-server-git-c9b80faab8a99139bcac047f630be3ce28a508a6.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_sync.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 588774a7a9..8498e54c09 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -95,8 +95,8 @@ [{description, "core metrics storage"}, {mfa, {rabbit_sup, start_child, [rabbit_metrics]}}, - {requires, external_infrastructure}, - {enables, kernel_ready}]}). + {requires, pre_boot}, + {enables, external_infrastructure}]}). -rabbit_boot_step({rabbit_event, [{description, "statistics event manager"}, diff --git a/src/rabbit_mirror_queue_sync.erl b/src/rabbit_mirror_queue_sync.erl index d6357e0dc0..2994e8cbcf 100644 --- a/src/rabbit_mirror_queue_sync.erl +++ b/src/rabbit_mirror_queue_sync.erl @@ -37,7 +37,7 @@ %% %% Master Syncer Slave(s) %% sync_mirrors -> || || -%% (from channel) || -- (spawns) --> || || +%% || -- (spawns) --> || || %% || --------- sync_start (over GM) -------> || %% || || <--- sync_ready ---- || %% || || (or) || |