Skip to content

Commit f0c7620

Browse files
committed
Fix log output precision of cloudi_service_http_cowboy, cloudi_service_http_client, cloudi_service_http_elli.
1 parent 46f859a commit f0c7620

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

src/cloudi_http_cowboy_handler.erl

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
%%%
3131
%%% @author Michael Truog <mjtruog [at] gmail (dot) com>
3232
%%% @copyright 2012-2017 Michael Truog
33-
%%% @version 1.7.1 {@date} {@time}
33+
%%% @version 1.7.2 {@date} {@time}
3434
%%%------------------------------------------------------------------------
3535

3636
-module(cloudi_http_cowboy_handler).
@@ -123,7 +123,7 @@ handle(Req0,
123123
use_x_method_override = UseXMethodOverride,
124124
use_method_suffix = UseMethodSuffix
125125
} = State) ->
126-
RequestStartMilliSec = ?LOG_WARN_APPLY(fun request_time_start/0, []),
126+
RequestStartMicroSec = ?LOG_WARN_APPLY(fun request_time_start/0, []),
127127
{MethodHTTP, Req1} = cowboy_req:method(Req0),
128128
{HeadersIncoming0, Req2} = cowboy_req:headers(Req1),
129129
Method = if
@@ -181,7 +181,7 @@ handle(Req0,
181181
?LOG_WARN_APPLY(fun request_time_end_error/6,
182182
[HttpCode, MethodHTTP,
183183
NameIncoming, undefined,
184-
RequestStartMilliSec, not_acceptable]),
184+
RequestStartMicroSec, not_acceptable]),
185185
{ok, Req, State};
186186
RequestAccepted =:= true ->
187187
NameOutgoing = if
@@ -266,7 +266,7 @@ handle(Req0,
266266
?LOG_TRACE_APPLY(fun request_time_end_success/5,
267267
[HttpCode, MethodHTTP,
268268
NameIncoming, NameOutgoing,
269-
RequestStartMilliSec]),
269+
RequestStartMicroSec]),
270270
{ok, Req, NewState};
271271
{{cowboy_error, timeout},
272272
ReqN0, NewState} ->
@@ -287,7 +287,7 @@ handle(Req0,
287287
?LOG_WARN_APPLY(fun request_time_end_error/6,
288288
[HttpCode, MethodHTTP,
289289
NameIncoming, NameOutgoing,
290-
RequestStartMilliSec, timeout]),
290+
RequestStartMicroSec, timeout]),
291291
{ok, Req, NewState};
292292
{{cowboy_error, Reason},
293293
ReqN0, NewState} ->
@@ -297,7 +297,7 @@ handle(Req0,
297297
?LOG_WARN_APPLY(fun request_time_end_error/6,
298298
[HttpCode, MethodHTTP,
299299
NameIncoming, NameOutgoing,
300-
RequestStartMilliSec, Reason]),
300+
RequestStartMicroSec, Reason]),
301301
{ok, Req, NewState}
302302
end
303303
end.
@@ -942,19 +942,19 @@ get_query_string_external_text([{K, V} | L]) ->
942942
end.
943943

944944
request_time_start() ->
945-
cloudi_timestamp:milliseconds_monotonic().
945+
cloudi_timestamp:microseconds_monotonic().
946946

947947
request_time_end_success(HttpCode, Method, NameIncoming, NameOutgoing,
948-
RequestStartMilliSec) ->
948+
RequestStartMicroSec) ->
949949
?LOG_TRACE("~w ~s ~s (to ~s) ~p ms",
950950
[HttpCode, Method, NameIncoming, NameOutgoing,
951-
(cloudi_timestamp:milliseconds_monotonic() -
952-
RequestStartMilliSec)]).
951+
(cloudi_timestamp:microseconds_monotonic() -
952+
RequestStartMicroSec) / 1000.0]).
953953

954954
request_time_end_error(HttpCode, Method, NameIncoming, NameOutgoing,
955-
RequestStartMilliSec, Reason) ->
956-
RequestTime = cloudi_timestamp:milliseconds_monotonic() -
957-
RequestStartMilliSec,
955+
RequestStartMicroSec, Reason) ->
956+
RequestTime = (cloudi_timestamp:microseconds_monotonic() -
957+
RequestStartMicroSec) / 1000.0,
958958
if
959959
NameOutgoing =:= undefined ->
960960
?LOG_WARN("~w ~s ~s ~p ms: ~p",
@@ -967,21 +967,21 @@ request_time_end_error(HttpCode, Method, NameIncoming, NameOutgoing,
967967
end.
968968

969969
websocket_time_start() ->
970-
cloudi_timestamp:milliseconds_monotonic().
970+
cloudi_timestamp:microseconds_monotonic().
971971

972972
websocket_time_end_success(NameIncoming, NameOutgoing,
973-
RequestStartMilliSec) ->
973+
RequestStartMicroSec) ->
974974
?LOG_TRACE("~s (to ~s) ~p ms",
975975
[NameIncoming, NameOutgoing,
976-
(cloudi_timestamp:milliseconds_monotonic() -
977-
RequestStartMilliSec)]).
976+
(cloudi_timestamp:microseconds_monotonic() -
977+
RequestStartMicroSec) / 1000.0]).
978978

979979
websocket_time_end_error(NameIncoming, NameOutgoing,
980-
RequestStartMilliSec, Reason) ->
980+
RequestStartMicroSec, Reason) ->
981981
?LOG_WARN("~s (to ~s) ~p ms: ~p",
982982
[NameIncoming, NameOutgoing,
983-
(cloudi_timestamp:milliseconds_monotonic() -
984-
RequestStartMilliSec), Reason]).
983+
(cloudi_timestamp:microseconds_monotonic() -
984+
RequestStartMicroSec) / 1000.0, Reason]).
985985

986986
websocket_request_end(Name, NewTimeout, OldTimeout) ->
987987
?LOG_TRACE("~s ~p ms", [Name, OldTimeout - NewTimeout]).
@@ -1463,13 +1463,13 @@ websocket_handle_incoming_request(Dispatcher, NameOutgoing,
14631463
RequestInfo, Request, TimeoutSync, ResponseF,
14641464
WebSocketRequestType, Req,
14651465
NameIncoming, State) ->
1466-
RequestStartMilliSec = ?LOG_WARN_APPLY(fun websocket_time_start/0, []),
1466+
RequestStartMicroSec = ?LOG_WARN_APPLY(fun websocket_time_start/0, []),
14671467
case send_sync_minimal(Dispatcher, NameOutgoing, RequestInfo, Request,
14681468
TimeoutSync, self()) of
14691469
{ok, ResponseInfo, Response} ->
14701470
?LOG_TRACE_APPLY(fun websocket_time_end_success/3,
14711471
[NameIncoming, NameOutgoing,
1472-
RequestStartMilliSec]),
1472+
RequestStartMicroSec]),
14731473
case websocket_terminate_check(ResponseInfo) of
14741474
true when Response == <<>> ->
14751475
{reply, close, Req, State};
@@ -1483,7 +1483,7 @@ websocket_handle_incoming_request(Dispatcher, NameOutgoing,
14831483
{error, timeout} ->
14841484
?LOG_WARN_APPLY(fun websocket_time_end_error/4,
14851485
[NameIncoming, NameOutgoing,
1486-
RequestStartMilliSec, timeout]),
1486+
RequestStartMicroSec, timeout]),
14871487
{reply, {WebSocketRequestType, <<>>}, Req, State}
14881488
end.
14891489

0 commit comments

Comments
 (0)