diff options
| author | Andreas Jaeger <aj@suse.com> | 2020-05-13 14:00:34 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2020-05-13 14:09:38 +0200 |
| commit | d6b4ed4c7bb251e4378b4eab836e8798a83c75dc (patch) | |
| tree | f76bcfd1e61b69d11ce2e3f951af5f2bec9256df /ceilometermiddleware/swift.py | |
| parent | f7c3a86d48e61dbfe0c5ffd0d5ca6662662dd627 (diff) | |
| download | ceilometermiddleware-d6b4ed4c7bb251e4378b4eab836e8798a83c75dc.tar.gz | |
Further Cleanup py27 support
This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove obsolete sections from setup.cfg
- Use newer openstackdocstheme,reno and Sphinx versions
- Remove install_command from tox.ini, the default is fine
- Use TOX_CONSTRAINTS_FILE, UPPER_CONSTRAINTS_FILE is obsolete
- Update hacking to 3.0.1, fix warnings found
- Remove babel.cfg, it's not needed anymore
Change-Id: I60edb7e44e4a8222f564f30157eb31288b85b422
Diffstat (limited to 'ceilometermiddleware/swift.py')
| -rw-r--r-- | ceilometermiddleware/swift.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ceilometermiddleware/swift.py b/ceilometermiddleware/swift.py index 1ee6e93..3f86250 100644 --- a/ceilometermiddleware/swift.py +++ b/ceilometermiddleware/swift.py @@ -292,10 +292,11 @@ class Swift(object): @_log_and_ignore_error def emit_event(self, env, bytes_received, bytes_sent, outcome='success'): - if ((env.get('HTTP_X_SERVICE_PROJECT_ID') or - env.get('HTTP_X_PROJECT_ID') or - env.get('HTTP_X_TENANT_ID')) in self.ignore_projects or - env.get('swift.source') is not None): + if ( + (env.get('HTTP_X_SERVICE_PROJECT_ID') + or env.get('HTTP_X_PROJECT_ID') + or env.get('HTTP_X_TENANT_ID')) in self.ignore_projects + or env.get('swift.source') is not None): return path = urlparse.quote(env.get('swift.backend_path', env['PATH_INFO'])) @@ -355,8 +356,8 @@ class Swift(object): initiator = cadf_resource.Resource( typeURI='service/security/account/user', id=env.get('HTTP_X_USER_ID')) - initiator.project_id = (env.get('HTTP_X_PROJECT_ID') or - env.get('HTTP_X_TENANT_ID')) + initiator.project_id = (env.get('HTTP_X_PROJECT_ID') + or env.get('HTTP_X_TENANT_ID')) # build notification body event = cadf_event.Event(eventTime=now, outcome=outcome, |