summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2010-09-08 15:01:14 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2010-09-08 15:01:14 +0100
commitf9f1c065b593b745bf8d3d246a75297b688d850d (patch)
tree959d3b9c6d46172af253e403332b0c032bef968c
parent5a1d2f0ee23ea3e2d346ec85ca138d1e54cc17ca (diff)
downloadrabbitmq-server-git-f9f1c065b593b745bf8d3d246a75297b688d850d.tar.gz
reformat time range
-rw-r--r--src/rabbit_ssl.erl9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl
index 4db1bbc138..289ae8bd7d 100644
--- a/src/rabbit_ssl.erl
+++ b/src/rabbit_ssl.erl
@@ -82,8 +82,9 @@ ssl_validity(Sock) ->
validity = Validity }}) ->
case extract_ssl_values(Validity) of
{'Validity', Start, End} ->
- io_lib:format("~s to ~s", [format_ssl_value(Start),
- format_ssl_value(End)]);
+ lists:flatten(
+ io_lib:format("~s-~s", [format_ssl_value(Start),
+ format_ssl_value(End)]));
V ->
io_lib:format("~p", [V])
end
@@ -100,7 +101,7 @@ ssl_info(F, Sock) ->
case public_key:pkix_decode_cert(Cert, otp) of
{ok, DecCert} ->
try F(DecCert) %% here be dragons; decompose an undocumented
- %% structure
+ %% structure
catch
C:E ->
rabbit_log:info("Problems while processing SSL info: ~p:~p~n",
@@ -205,7 +206,7 @@ format_ssl_value({utf8String, Bin}) ->
binary:bin_to_list(Bin);
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",
+ io_lib:format("20~c~c-~c~c-~c~cT~c~c:~c~c:~c~cZ",
[Y1, Y2, M1, M2, D1, D2, H1, H2, Min1, Min2, S1, S2]);
format_ssl_value(V) ->
io_lib:format("~p", [V]).