diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-06 16:12:38 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-06 16:12:38 +0100 |
| commit | fdfc3104abc31e7f7f9e45f2459e3dd0f3aaccb5 (patch) | |
| tree | 38ad2bd8346e11adac3a96e1ab49987228ff9a79 | |
| parent | 50d0fe1ecc3e65b66559e32e4b5ec2b8d46286a8 (diff) | |
| download | rabbitmq-server-git-fdfc3104abc31e7f7f9e45f2459e3dd0f3aaccb5.tar.gz | |
reformatted date range
Now, the output looks like this:
% rabbitmqctl list_connections peer_address ssl_subject ssl_issuer ssl_validity
Listing connections ...
127.0.0.1 CN=dakota,O=client4 CN=MyTestCA 2010-09-01 17:34:57 to 2011-09-01 17:34:57
...done.
| -rw-r--r-- | src/rabbit_reader.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index f885e84adc..e4825d3276 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -894,7 +894,7 @@ get_ssl_validity(#'OTPCertificate' { tbsCertificate = #'OTPTBSCertificate' { validity = Validity }}) -> case extract_ssl_values(Validity) of - {'validity', Start, End} -> io_lib:format("~s:~s", [Start, End]); + {'validity', Start, End} -> io_lib:format("~s to ~s", [Start, End]); V -> V end. @@ -960,8 +960,10 @@ format_ssl_value({printableString, S}) -> S; format_ssl_value({utf8String, Bin}) -> Bin; -format_ssl_value({utcTime, [Y1, Y2, M1, M2, D1, D2 | _]}) -> - io_lib:format("20~c~c-~c~c-~c~c", [Y1, Y2, M1, M2, D1, D2]); +format_ssl_value({utcTime, [Y1, Y2, M1, M2, D1, D2, H1, H2, + Min1, Min2, S1, S2, $Z]}) -> + io_lib:format("20~c~c-~c~c-~c~c ~c~c:~c~c:~c~c", + [Y1, Y2, M1, M2, D1, D2, H1, H2, Min1, Min2, S1, S2]); format_ssl_value(V) -> V. |