vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

refactor(model/log): pull allowed action types into constant

Browse source
This commit is contained in:
EvB 2017-04-07 11:39:54 -04:00
parent d0aaaaa1ef
commit 20c4d971c4
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
data/model/log.py
View file

@ -11,6 +11,8 @@ from data.model import config, user, DataModelException
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
ACTIONS_ALLOWED_WITHOUT_AUDIT_LOGGING = ['pull_repo']
def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None, def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None,
ignore=None): ignore=None):
joined = (LogEntry joined = (LogEntry
@ -121,10 +123,12 @@ def log_action(kind_name, user_or_organization_name, performer=None, repository=
'metadata_json': metadata_json, 'metadata_json': metadata_json,
'datetime': timestamp 'datetime': timestamp
} }
try: try:
LogEntry.create(**log_data) LogEntry.create(**log_data)
except PeeweeException as ex: except PeeweeException as ex:
if kind_name is 'pull_repo' and config.app_config.get('ALLOW_PULLS_WITHOUT_STRICT_LOGGING'): strict_logging_disabled = config.app_config.get('ALLOW_PULLS_WITHOUT_STRICT_LOGGING')
if strict_logging_disabled and kind_name in ACTIONS_ALLOWED_WITHOUT_AUDIT_LOGGING:
logger.exception('log_action failed', extra=({'exception': ex}).update(log_data)) logger.exception('log_action failed', extra=({'exception': ex}).update(log_data))
else: else:
raise raise