Merge branch 'master' into git
This commit is contained in:
commit
93cd459460
27 changed files with 873 additions and 343 deletions
|
@ -16,6 +16,8 @@ from data import model
|
|||
from data.model import oauth
|
||||
from app import app, storage as store
|
||||
|
||||
from workers import repositoryactioncounter
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -221,6 +223,7 @@ def initialize_database():
|
|||
LogEntryKind.create(name='create_tag')
|
||||
LogEntryKind.create(name='move_tag')
|
||||
LogEntryKind.create(name='delete_tag')
|
||||
LogEntryKind.create(name='revert_tag')
|
||||
LogEntryKind.create(name='add_repo_permission')
|
||||
LogEntryKind.create(name='change_repo_permission')
|
||||
LogEntryKind.create(name='delete_repo_permission')
|
||||
|
@ -589,6 +592,9 @@ def populate_database():
|
|||
'trigger_id': trigger.uuid, 'config': json.loads(trigger.config),
|
||||
'service': trigger.service.name})
|
||||
|
||||
while repositoryactioncounter.count_repository_actions():
|
||||
pass
|
||||
|
||||
if __name__ == '__main__':
|
||||
log_level = getattr(logging, app.config['LOGGING_LEVEL'])
|
||||
logging.basicConfig(level=log_level)
|
||||
|
|
Reference in a new issue