Unverified Commit 03c1e2fc authored by Peter Stanko's avatar Peter Stanko
Browse files

Ultimate permission refactor

parent bce9eba4
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -3,18 +3,16 @@ Main application module
- Creates instance of the flask app named app
- registers commands
"""
import logging as logger

import click
from flask import Flask
from flask.cli import AppGroup, run_command

import portal
import portal.logging as logging_config
from management.data import DataManagement
from portal import create_app, db
from portal import create_app, db, logger

logging_config.load_config()
logger.load_config()

log = logger.getLogger(__name__)

+2 −1
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ import random
import string
from flask_sqlalchemy import SQLAlchemy

from portal import logger
from portal.database.models import Worker, Course, Group, Project, ReviewItem, Role, User

log = logging.getLogger(__name__)
log = logger.getLogger(__name__)


def password_generator(size=16, chars=string.ascii_letters + string.digits):
+4 −5
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@
Main Portal module
"""

import logging
import os
from typing import Union

from celery import Celery
from flask import Flask
from flask_cors import CORS
@@ -14,7 +14,7 @@ from flask_oauthlib.client import OAuth
from flask_sqlalchemy import SQLAlchemy
from storage import Storage

from portal import rest
from portal import logger, rest
from portal.config import CONFIGURATIONS
from portal.tools.gitlab_client import GitlabFactory
from portal.tools.ldap_client import LDAPWrapper
@@ -29,7 +29,7 @@ migrate = Migrate(db=db)
gitlab_factory = GitlabFactory()
ldap_wrapper = LDAPWrapper()

log = logging.getLogger(__name__)
log = logger.getLogger(__name__)


def configure_app(app: Flask, env: str = None,
@@ -128,4 +128,3 @@ def get_celery(app: Flask) -> Union[Celery, None]:
        return None
    from portal.async_celery import celery_app
    return celery_app
+2 −1
Original line number Diff line number Diff line
@@ -3,10 +3,11 @@ from pathlib import Path

from storage import UploadedEntity

from portal import logger
from portal.database import Project, Submission, SubmissionState
from portal.service import general

log = logging.getLogger(__name__)
log = logger.getLogger(__name__)


class SubmissionProcessor:
+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ Types:
"""

import datetime
import logging
import os
import tempfile

from portal import logger
from portal.tools import paths

log = logging.getLogger(__name__)
log = logger.getLogger(__name__)


# pylint: disable=too-few-public-methods
Loading