Merge pull request #3352 from kleesc/elastic_logs_model_implementation

Implement logs model using Elasticsearch
This commit is contained in:
Sida Chen 2019-02-13 15:51:13 -05:00 committed by GitHub
commit d67bbd4917
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 1282 additions and 38 deletions

View file

@ -117,7 +117,7 @@ def log_action(kind_name, user_or_organization_name, performer=None, repository=
else:
account = config.app_config.get('SERVICE_LOG_ACCOUNT_ID')
if account is None:
account = User.select(fn.Min(User.id)).tuples().get()[0]
account = user.get_minimum_user_id()
if performer is not None:
performer = performer.id

View file

@ -643,6 +643,14 @@ def get_user_by_id(user_db_id):
return None
def get_user_map_by_ids(namespace_ids):
id_user = {namespace_id: None for namespace_id in namespace_ids}
users = User.select().where(User.id << namespace_ids, User.organization == False)
for user in users:
id_user[user.id] = user
return id_user
def get_namespace_user_by_user_id(namespace_user_db_id):
try:
return User.get(User.id == namespace_user_db_id, User.robot == False)
@ -1068,6 +1076,10 @@ def list_namespace_geo_restrictions(namespace_name):
.where(User.username == namespace_name))
def get_minimum_user_id():
return User.select(fn.Min(User.id)).tuples().get()[0]
class LoginWrappedDBUser(UserMixin):
def __init__(self, user_uuid, db_user=None):
self._uuid = user_uuid