diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-01-15 02:40:18 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-01-15 02:40:18 +0300 |
| commit | ffce71a5d735525d9abc1fbe0beb4e0ade1e25a2 (patch) | |
| tree | fece5fac31c3fd23e1edcc94aaebcc3b8d7474b2 | |
| parent | 32f39d36f8a757e3c19816feb6201daa512e0def (diff) | |
| parent | 9a1b1caad973826a074a5f1e2fa25a8c6649832b (diff) | |
| download | rabbitmq-server-git-ffce71a5d735525d9abc1fbe0beb4e0ade1e25a2.tar.gz | |
Merge branch 'stable'
Conflicts:
src/rabbit.erl
src/rabbit_error_logger_file_h.erl
src/rabbit_sasl_report_file_h.erl
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 7 | ||||
| -rw-r--r-- | src/rabbit.erl | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index fb4959b276..c9b699d634 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -275,10 +275,9 @@ suffixed files. </para> <para> - When the target files do not exist they are created. - When no <option>suffix</option> is specified, the empty - log files are simply created at the original location; - no rotation takes place. + When the target files do not exist they are created. When + no <option>suffix</option> is specified, no rotation takes + place - log files are just re-opened. </para> <para role="example-prefix">For example:</para> <screen role="example">rabbitmqctl rotate_logs .1</screen> diff --git a/src/rabbit.erl b/src/rabbit.erl index 8f415eb582..4fff48c50f 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -445,7 +445,6 @@ environment(App) -> lists:keysort(1, [P || P = {K, _} <- application:get_all_env(App), not lists:member(K, Ignore)]). - rotate_logs() -> rabbit_lager:fold_sinks( fun |