diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2011-02-19 09:59:41 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-19 09:59:41 +0000 |
| commit | c050c1fd6ceb20a74a3accdce8979a9b8756de6a (patch) | |
| tree | de5b208dc06e96e46459ba19ec94dbd5f60ce4e2 /nova | |
| parent | 8de8d1d045ca9fe12596e53d2244f4f8703cc209 (diff) | |
| parent | d4a37dc28daf990d903ffd14607862cb2eafb1c8 (diff) | |
| download | nova-c050c1fd6ceb20a74a3accdce8979a9b8756de6a.tar.gz nova-c050c1fd6ceb20a74a3accdce8979a9b8756de6a.tar.xz nova-c050c1fd6ceb20a74a3accdce8979a9b8756de6a.zip | |
Calculate time correctly for ec2 request logs
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/__init__.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 1a06b3f01..f892123fd 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -20,7 +20,6 @@ Starting point for routing EC2 requests. """ -import datetime import webob import webob.dec import webob.exc @@ -56,23 +55,20 @@ class RequestLogging(wsgi.Middleware): @webob.dec.wsgify def __call__(self, req): + start = utils.utcnow() rv = req.get_response(self.application) - self.log_request_completion(rv, req) + self.log_request_completion(rv, req, start) return rv - def log_request_completion(self, response, request): + def log_request_completion(self, response, request, start): controller = request.environ.get('ec2.controller', None) if controller: controller = controller.__class__.__name__ action = request.environ.get('ec2.action', None) ctxt = request.environ.get('ec2.context', None) - seconds = 'X' - microseconds = 'X' - if ctxt: - delta = datetime.datetime.utcnow() - \ - ctxt.timestamp - seconds = delta.seconds - microseconds = delta.microseconds + delta = utils.utcnow() - start + seconds = delta.seconds + microseconds = delta.microseconds LOG.info( "%s.%ss %s %s %s %s:%s %s [%s] %s %s", seconds, |