mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-07-03 20:45:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix logger request duration calculation

Browse source
This commit is contained in:
Nikolay Kim 2018-04-02 11:09:24 -07:00
parent 9d39f441e9
commit 83bf852192
3 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -19,6 +19,8 @@
* Fix client connection pooling
* Fix logger request duration calculation #152
## 0.4.10 (2018-03-20)

6
examples/hello-world/src/main.rs
View file

@ -11,10 +11,10 @@ fn index(_req: HttpRequest) -> &'static str {
fn main() {
::std::env::set_var("RUST_LOG", "actix_web=info");
let _ = env_logger::init();
let sys = actix::System::new("ws-example");
env_logger::init();
let sys = actix::System::new("hello-world");
let _addr = server::new(
server::new(
|| App::new()
// enable logger
.middleware(middleware::Logger::default())

16
src/middleware/logger.rs
View file

@ -231,18 +231,14 @@ impl FormatText {
FormatText::ResponseSize => resp.response_size().fmt(fmt),
FormatText::Pid => unsafe{libc::getpid().fmt(fmt)},
FormatText::Time => {
let response_time = time::now() - entry_time;
let response_time = response_time.num_seconds() as f64 +
(response_time.num_nanoseconds().unwrap_or(0) as f64)/1_000_000_000.0;
fmt.write_fmt(format_args!("{:.6}", response_time))
let rt = time::now() - entry_time;
let rt = (rt.num_nanoseconds().unwrap_or(0) as f64) / 1_000_000_000.0;
fmt.write_fmt(format_args!("{:.6}", rt))
},
FormatText::TimeMillis => {
let response_time = time::now() - entry_time;
let response_time_ms = (response_time.num_seconds() * 1000) as f64 +
(response_time.num_nanoseconds().unwrap_or(0) as f64)/1_000_000.0;
fmt.write_fmt(format_args!("{:.6}", response_time_ms))
let rt = time::now() - entry_time;
let rt = (rt.num_nanoseconds().unwrap_or(0) as f64) / 1_000_000.0;
fmt.write_fmt(format_args!("{:.6}", rt))
},
FormatText::RemoteAddr => {
if let Some(remote) = req.connection_info().remote() {