Merge eaeae06 into 9805311

yosuke-furukawa · Apr 22, 2017 · a798498 · a798498
2 parents 9805311 + eaeae06
commit a798498
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -30,6 +30,7 @@ app.use((req, res, next) => {
   next()
 })
 app.use((req, res, next) => {
+  // All timings should be in milliseconds (s). See issue #9 (https://github.com/yosuke-furukawa/server-timing/issues/9).
   res.setMetric('db', 100.0, "Database metric")
   res.setMetric('api', 200.0, "HTTP/API metric")
   res.setMetric('cache', 300.0, "cache metric")

diff --git a/index.js b/index.js
@@ -21,7 +21,7 @@ module.exports = function serverTiming (options) {
     onHeaders(res, () => {
       if (opts.total) {
         const diff = process.hrtime(startAt)
-        const timeSec = (diff[0] + diff[1] * 1e-9)
+        const timeSec = (diff[0] * 1E3) + (diff[1] * 1e-6)
         headers.push(`total=${timeSec}; "Total Response Time"`)
       }
       timer.clear()

diff --git a/timer.js b/timer.js
@@ -17,7 +17,7 @@ class Timer {
       return console.warn(`No such name ${name}`)
     }
     const duration = process.hrtime(timeObj.start)
-    const value = (duration[0] + duration[1] * 1e-9)
+    const value = (duration[0] * 1E3) + (duration[1] * 1e-6)
     timeObj.value = value
     this._times.delete(name)
     return timeObj