Fixed colored logging

.gitignore

@@ -5,4 +5,5 @@ __pycache__/
 .pytest_cache/
 portal.local.cfg
 Pipfile.lock
-devel.db
\ No newline at end of file
+devel.db
+log/*.*
\ No newline at end of file

app.py

@@ -14,7 +14,7 @@ from portal import create_app, db, logger
 
 logger.load_config()
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 data_cli = AppGroup('data', help='Sample data initialization')
 users_cli = AppGroup('users', help='Users management')

management/data/shared.py

@@ -2,7 +2,6 @@
 Factory to create sample data
 """
 
-import logging
 import random
 import string
 from flask_sqlalchemy import SQLAlchemy
@@ -10,7 +9,7 @@ from flask_sqlalchemy import SQLAlchemy
 from portal import logger
 from portal.database.models import Worker, Course, Group, Project, ReviewItem, Role, User
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 def password_generator(size=16, chars=string.ascii_letters + string.digits):

portal/__init__.py

@@ -29,7 +29,7 @@ migrate = Migrate(db=db)
 gitlab_factory = GitlabFactory()
 ldap_wrapper = LDAPWrapper()
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 def configure_app(app: Flask, env: str = None,

portal/async_celery/submission_processor.py

@@ -7,7 +7,7 @@ from portal import logger
 from portal.database import Project, Submission, SubmissionState
 from portal.service import general
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 class SubmissionProcessor:

portal/config.py

@@ -14,7 +14,7 @@ import tempfile
 from portal import logger
 from portal.tools import paths
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 # pylint: disable=too-few-public-methods

portal/logger.py

@@ -5,7 +5,7 @@ Logging configuration module
 import logging
 from logging.config import dictConfig
 
-import coloredlogs
+from portal.tools import paths
 
 FORMATTERS = {
     'verbose': {
@@ -15,18 +15,30 @@ FORMATTERS = {
     'simple': {
         'format': '%(levelname)s %(message)s'
     },
+    'colored_console': {
+        '()': 'coloredlogs.ColoredFormatter',
+        'format': "%(asctime)s - %(name)s - %(levelname)s - %(message)s", 'datefmt': '%H:%M:%S'
+    },
 }
 
 HANDLERS = {
     'console': {
         'level': 'DEBUG',
         'class': 'logging.StreamHandler',
-        'formatter': 'verbose'
+        'formatter': 'colored_console'
     },
+    'file': {
+        'level': 'DEBUG',
+        'class': 'logging.handlers.RotatingFileHandler',
+        'formatter': 'verbose',
+        'filename': str(paths.LOG_DIR / 'portal.log'),
+        'maxBytes': 500000,
+        'backupCount': 5
+    }
 }
 
 LOGGERS = {
-    'portal': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
+    'portal': {'handlers': ['console', 'file'], 'level': 'DEBUG', 'propagate': True},
     'tests': {'handlers': ['console'], 'level': 'DEBUG', 'propagate': True},
     'management': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
     'app': {'handlers': ['console'], 'level': 'INFO', 'propagate': True},
@@ -53,7 +65,6 @@ def load_config(conf_type=None):
     dictConfig(LOGGING_CONF)
 
 
-def getLogger(*args, **kwargs):
+def get_logger(*args, **kwargs):
     logger = logging.getLogger(*args, **kwargs)
-    coloredlogs.install(logger=logger)
     return logger

portal/rest/courses.py

@@ -14,7 +14,7 @@ from portal.service.filters import filter_course_dump
 from portal.service.general import find_course
 
 courses_namespace = Namespace('courses')
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @courses_namespace.route('')

portal/rest/errors.py

@@ -11,7 +11,7 @@ from portal import logger
 from portal.rest import rest_api
 from portal.service.errors import PortalAPIError, IncorrectCredentialsError
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 def load_errors(app: Flask):

portal/rest/gitlab.py

@@ -9,7 +9,7 @@ from portal.rest import rest_api
 from portal.service import general
 from portal.service.users import create_user
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 oauth_namespace = Namespace('oauth')
 

portal/rest/groups.py

@@ -14,7 +14,7 @@ from portal.service.groups import add_project_to_group, add_single_user_to_group
 
 groups_namespace = Namespace('')
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @groups_namespace.route('/courses/<string:cid>/groups')

portal/rest/login.py

@@ -11,7 +11,7 @@ from portal.service.auth import login_gitlab, login_username_password, login_sec
 from portal.service.errors import PortalAPIError, UnauthorizedError
 from portal.service.general import find_client, find_client_owner
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 auth_namespace = Namespace('auth')
 

portal/rest/management.py

@@ -4,7 +4,7 @@ from flask_restplus import Namespace, Resource, fields
 from portal import logger
 
 management_namespace = Namespace('management')
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 status_schema = management_namespace.model('StatusSchema', {
     'status': fields.String()

portal/rest/projects.py

@@ -19,7 +19,7 @@ from portal.tools import time
 
 projects_namespace = Namespace('')  # pylint: disable=invalid-name
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @projects_namespace.route('/courses/<string:cid>/projects')

portal/rest/roles.py

@@ -14,7 +14,7 @@ from portal.service.roles import add_single_client_to_role, create_role, delete_
 
 roles_namespace = Namespace('')
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @roles_namespace.route('/courses/<string:cid>/roles')

portal/rest/submissions.py

@@ -11,7 +11,7 @@ from portal.service.submissions import SubmissionsService
 
 submissions_namespace = Namespace('submissions')
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @submissions_namespace.route('/<string:sid>')

portal/rest/users.py

@@ -22,7 +22,7 @@ from portal.service.users import create_user, delete_user, find_groups_filtered,
 
 users_namespace = Namespace('users')
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @users_namespace.route('')

portal/rest/workers.py

@@ -11,7 +11,7 @@ from portal.service.workers import create_worker, delete_worker, find_all_worker
     update_worker
 
 workers_namespace = Namespace('workers')
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 @workers_namespace.route('')

portal/service/courses.py

@@ -12,7 +12,7 @@ from portal.service.groups import copy_group
 from portal.service.projects import copy_project
 from portal.service.roles import copy_role
 
-log = logger.getLogger(__name__)
+log = logger.get_logger(__name__)
 
 
 def copy_course(source: Course, target: Course, config: dict) -> Course: