diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-12-03 13:22:37 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-12-03 13:22:37 +0300 |
| commit | 65de676a01e4a0bda3373d2fd8447da8d34280e6 (patch) | |
| tree | 42779ec0158cab703b6fff59f35dbdbaa70c8c89 | |
| parent | 4e9bee8bab606bbb8764fe825b5483717b39af4a (diff) | |
| download | rabbitmq-server-git-65de676a01e4a0bda3373d2fd8447da8d34280e6.tar.gz | |
Log rotation date spec: parse $H the same way Lager does
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_logger_std_h.erl | 8 | ||||
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_logger_std_h.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_logger_std_h.erl index 1bcf7938b2..abb1d2ff73 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_logger_std_h.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_logger_std_h.erl @@ -612,19 +612,19 @@ parse_date_spec([$D, D1 | Rest], Acc0) when D1 >= $0, D1 =< $9 -> parse_date_spec(Rest, Acc); %% $H23 parse_date_spec([$$, $H, H1, H2 | Rest], Acc0) when H1 >= $0, H1 =< $9, H2 >= $0, H2 =< $9 -> - Acc = parse_minute([H1, H2], Acc0#{every => day, hour => 0}), + Acc = parse_minute([H1, H2], Acc0#{every => hour}), parse_date_spec(Rest, Acc); %% H23 parse_date_spec([$H, H1, H2 | Rest], Acc0) when H1 >= $0, H1 =< $9, H2 >= $0, H2 =< $9 -> - Acc = parse_minute([H1, H2], Acc0#{hour => 0}), + Acc = parse_minute([H1, H2], Acc0), parse_date_spec(Rest, Acc); %% $H0 parse_date_spec([$$, $H, H1 | Rest], Acc0) when H1 >= $0, H1 =< $9 -> - Acc = parse_minute([H1], Acc0#{every => day, hour => 0}), + Acc = parse_minute([H1], Acc0#{every => hour}), parse_date_spec(Rest, Acc); %% H0 parse_date_spec([$H, H1 | Rest], Acc0) when H1 >= $0, H1 =< $9 -> - Acc = parse_minute([H1], Acc0#{hour => 0}), + Acc = parse_minute([H1], Acc0), parse_date_spec(Rest, Acc); %% $W0 parse_date_spec([$$, $W, W | Rest], Acc0) when W >= $0, W =< $6 -> diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl b/deps/rabbit/apps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl index 0ffac70f65..6f5b48aa6c 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl @@ -254,10 +254,10 @@ parse_date_spec_case5(_) -> parse_date_spec_case6(_) -> ?assertEqual( - #{every => day, hour => 0, minute => 30}, + #{every => hour, minute => 30}, rabbit_logger_std_h:parse_date_spec("$H30")), ?assertEqual( - #{every => day, hour => 0, minute => 3}, + #{every => hour, minute => 3}, rabbit_logger_std_h:parse_date_spec("$H3")), ?assertEqual( #{day_of_week => 0,every => week,hour => 0, minute => 30}, |