diff --git a/sysom_server/sysom_api/apps/accounts/apps.py b/sysom_server/sysom_api/apps/accounts/apps.py index 898c5eeb4f0b9b73ed31751173bff4743c9f3dcc..5b07d0d25aeeb8f6d5f6aba797607b6318291084 100644 --- a/sysom_server/sysom_api/apps/accounts/apps.py +++ b/sysom_server/sysom_api/apps/accounts/apps.py @@ -1,12 +1,9 @@ -import logging +from loguru import logger from django.apps import AppConfig from django.db.models.signals import post_migrate -logger = logging.getLogger(__name__) - - class AccountsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'apps.accounts' diff --git a/sysom_server/sysom_api/apps/accounts/authentication.py b/sysom_server/sysom_api/apps/accounts/authentication.py index d450aacc8d1d0f2fe05073df4b9d0de66ef4802f..8bf9a32de46635df545e382e3ece23983f40a2a0 100644 --- a/sysom_server/sysom_api/apps/accounts/authentication.py +++ b/sysom_server/sysom_api/apps/accounts/authentication.py @@ -6,7 +6,7 @@ @Software: PyCharm """ import os -import logging +from loguru import logger from django.conf import settings from django.utils.translation import ugettext as _ from rest_framework.exceptions import AuthenticationFailed @@ -16,8 +16,6 @@ from lib.utils import JWT, import_module from apps.accounts.models import User -logger = logging.getLogger(__name__) - class Authentication(BaseAuthentication): def authenticate(self, request: Request): diff --git a/sysom_server/sysom_api/apps/accounts/permissions.py b/sysom_server/sysom_api/apps/accounts/permissions.py index f64953d83578eb622bb3c5086f35db29cd682bf3..e0105deb731c89cf5ecfccddb6a75ccc4d3a9a98 100644 --- a/sysom_server/sysom_api/apps/accounts/permissions.py +++ b/sysom_server/sysom_api/apps/accounts/permissions.py @@ -5,7 +5,6 @@ @Author : DM @Software: PyCharm """ -import logging from rest_framework.permissions import BasePermission from rest_framework.request import Request from rest_framework.views import APIView @@ -13,9 +12,6 @@ from rest_framework.views import APIView from apps.accounts.models import User -logger = logging.getLogger(__name__) - - class CustomPermission(BasePermission): def __init__(self, message=None) -> None: super().__init__() diff --git a/sysom_server/sysom_api/apps/accounts/serializer.py b/sysom_server/sysom_api/apps/accounts/serializer.py index 3837c44a458e578962009a58e0ac57ba64ba29f7..2a1629a66bc3fa819f985e472206975b8e237d47 100644 --- a/sysom_server/sysom_api/apps/accounts/serializer.py +++ b/sysom_server/sysom_api/apps/accounts/serializer.py @@ -1,10 +1,8 @@ -import logging from rest_framework import serializers from . import models from lib.utils import JWT -logger = logging.getLogger(__name__) class UserListSerializer(serializers.ModelSerializer): role = serializers.SerializerMethodField() diff --git a/sysom_server/sysom_api/apps/accounts/views.py b/sysom_server/sysom_api/apps/accounts/views.py index f9861ccbc4d11bf508708450d02cd62456f7e236..db0ce17f6e6ed508bbe5c8f3e43598ed2a6c9864 100644 --- a/sysom_server/sysom_api/apps/accounts/views.py +++ b/sysom_server/sysom_api/apps/accounts/views.py @@ -1,5 +1,5 @@ from datetime import datetime -import logging +from loguru import logger from typing import Union from rest_framework.request import Request from rest_framework.viewsets import GenericViewSet @@ -16,8 +16,6 @@ from . import models from . import serializer from lib.response import success, other_response -logger = logging.getLogger(__name__) - class UserModelViewSet( GenericViewSet, diff --git a/sysom_server/sysom_api/apps/alarm/apps.py b/sysom_server/sysom_api/apps/alarm/apps.py index a132391f5d957c9f80bef6940bb4594d4a8f9551..f4aeb499f916b10333c00e6560bd53e8772b262f 100644 --- a/sysom_server/sysom_api/apps/alarm/apps.py +++ b/sysom_server/sysom_api/apps/alarm/apps.py @@ -1,9 +1,7 @@ -import logging +from loguru import logger from django.apps import AppConfig from django.db.models.signals import post_migrate -logger = logging.getLogger(__name__) - class AlarmConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' diff --git a/sysom_server/sysom_api/apps/alarm/serializer.py b/sysom_server/sysom_api/apps/alarm/serializer.py index 70afda4cc223efe87e78faec93b24542ad4a30ef..d3f2a6267631a543be524e70531fd239f93514a5 100644 --- a/sysom_server/sysom_api/apps/alarm/serializer.py +++ b/sysom_server/sysom_api/apps/alarm/serializer.py @@ -1,7 +1,5 @@ -import logging from rest_framework import serializers from apps.alarm.models import AlarmModel, SubscribeModel -logger = logging.getLogger(__name__) class AlarmSerializer(serializers.ModelSerializer): diff --git a/sysom_server/sysom_api/apps/alarm/views.py b/sysom_server/sysom_api/apps/alarm/views.py index a0612a632bc2ba289f7aae879334a43e66825c06..21c11c457ff3629ce8fcea4b8bc8516a54126ca1 100644 --- a/sysom_server/sysom_api/apps/alarm/views.py +++ b/sysom_server/sysom_api/apps/alarm/views.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger from rest_framework.viewsets import GenericViewSet from rest_framework import mixins from django.db.models import Q @@ -13,7 +13,6 @@ from cec_base.producer import Producer, dispatch_producer from cec_base.admin import Admin, dispatch_admin -logger = logging.getLogger(__name__) producer: Producer = dispatch_producer(settings.SYSOM_CEC_URL) admin: Admin = dispatch_admin(settings.SYSOM_CEC_URL) diff --git a/sysom_server/sysom_api/apps/host/apps.py b/sysom_server/sysom_api/apps/host/apps.py index 55c0b5891c33653b483a5787cd97fcf191c2f607..d9c2fbf1bfee9790414008795d3ae9fb61231b5b 100644 --- a/sysom_server/sysom_api/apps/host/apps.py +++ b/sysom_server/sysom_api/apps/host/apps.py @@ -1,10 +1,8 @@ -import logging +from loguru import logger import sys from django.apps import AppConfig from channel_job import default_channel_job_executor -logger = logging.getLogger(__name__) - class HostConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' diff --git a/sysom_server/sysom_api/apps/host/serializer.py b/sysom_server/sysom_api/apps/host/serializer.py index d0ab1d6d0ec13b1d70b78f45c949efddbf40768d..cae36a17d1efe2527c5ac1ff41ca001adc3feba2 100644 --- a/sysom_server/sysom_api/apps/host/serializer.py +++ b/sysom_server/sysom_api/apps/host/serializer.py @@ -1,10 +1,7 @@ -import logging from django.utils.translation import ugettext as _ from rest_framework import serializers from apps.host.models import HostModel, Cluster -logger = logging.getLogger(__name__) - class HostSerializer(serializers.ModelSerializer): diff --git a/sysom_server/sysom_api/apps/host/views.py b/sysom_server/sysom_api/apps/host/views.py index 79f779ccb840ec98fd81c99a06efbed3fa5e7298..9f1518705a65459f9080536d4735c4366630f647 100644 --- a/sysom_server/sysom_api/apps/host/views.py +++ b/sysom_server/sysom_api/apps/host/views.py @@ -1,5 +1,5 @@ import re -import logging +from loguru import logger import os import threading from typing import Any @@ -26,9 +26,6 @@ from apps.alarm.views import _create_alarm_message from channel_job import default_channel_job_executor -logger = logging.getLogger(__name__) - - class HostModelViewSet(CommonModelViewSet, mixins.ListModelMixin, mixins.RetrieveModelMixin, diff --git a/sysom_server/sysom_api/apps/services/apps.py b/sysom_server/sysom_api/apps/services/apps.py index 42542f005ed9db9cdf928274aabd116f7bd04ebc..746ce4495ef29b2fe50d8878b7bae11ecd904ecc 100644 --- a/sysom_server/sysom_api/apps/services/apps.py +++ b/sysom_server/sysom_api/apps/services/apps.py @@ -6,11 +6,9 @@ Email mfeng@linux.alibaba.com File apps.py Description: """ -import logging +from loguru import logger from django.apps import AppConfig -logger = logging.getLogger(__name__) - class ServicesConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' diff --git a/sysom_server/sysom_api/apps/services/serializer.py b/sysom_server/sysom_api/apps/services/serializer.py index 3f799a86de4b2b7dd6ae1cad6247afe0e1339b55..617f13b15de1e4a29f50b6ee0978a43943c939fa 100644 --- a/sysom_server/sysom_api/apps/services/serializer.py +++ b/sysom_server/sysom_api/apps/services/serializer.py @@ -1,10 +1,7 @@ -import logging from django.utils.translation import ugettext as _ from rest_framework import serializers from apps.services.models import ServiceInfo -logger = logging.getLogger(__name__) - class ServiceInfoSerializer(serializers.ModelSerializer): diff --git a/sysom_server/sysom_api/apps/services/views.py b/sysom_server/sysom_api/apps/services/views.py index 7859493643a6d7874f02aafee86a4632f8f104dd..28bc5e607fbf483d3f116dd37fe45b9015aff923 100644 --- a/sysom_server/sysom_api/apps/services/views.py +++ b/sysom_server/sysom_api/apps/services/views.py @@ -7,7 +7,6 @@ File views.py Description: """ -import logging from rest_framework import mixins from apps.common.common_model_viewset import CommonModelViewSet from lib.response import success @@ -16,9 +15,6 @@ from apps.services import serializer from apps.services.models import ServiceInfo -logger = logging.getLogger(__name__) - - class ServicesAPIView(CommonModelViewSet, mixins.ListModelMixin, mixins.RetrieveModelMixin,): diff --git a/sysom_server/sysom_api/conf/common.py b/sysom_server/sysom_api/conf/common.py index 4b7b4ae34d8487b8fffbbd03c40749061ef7955a..e1e2bafd19a22431d5873a94627c978439b7ad31 100644 --- a/sysom_server/sysom_api/conf/common.py +++ b/sysom_server/sysom_api/conf/common.py @@ -146,84 +146,7 @@ SYSOM_HOST_CONSUME_GROUP = "SYSOM_HOST_CONSUME_GROUP" SYSOM_HOST_CEC_URL = f"{SYSOM_CEC_URL}&channel_job_target_topic={SYSOM_CEC_CHANNEL_TOPIC}&channel_job_listen_topic={SYSOM_HOST_LISTEN_TOPIC}&channel_job_consumer_group={SYSOM_HOST_CONSUME_GROUP}" -SERVER_LOGS_FILE = os.path.join(BASE_DIR, 'logs', 'sys_om_info.log') -ERROR_LOGS_FILE = os.path.join(BASE_DIR, 'logs', 'sys_om_error.log') -if not os.path.exists(os.path.join(BASE_DIR, 'logs')): - os.makedirs(os.path.join(BASE_DIR, 'logs')) - - # JWT Token Decode DIR JWT_TOKEN_DECODE_DIR = os.path.join(BASE_DIR, 'lib', 'decode') if not os.path.exists(JWT_TOKEN_DECODE_DIR): os.makedirs(JWT_TOKEN_DECODE_DIR) - -# 格式:[2020-04-22 23:33:01][micoservice.apps.ready():16] [INFO] 这是一条日志: -# 格式:[日期][模块.函数名称():行号] [级别] 信息 -STANDARD_LOG_FORMAT = '[%(levelname).4s] -- %(asctime)s -- P_%(process) -- d_T_%(thread)d ' \ - '- <%(module)s:%(lineno)d>: %(message)s' -CONSOLE_LOG_FORMAT = '[%(levelname).4s] -- %(asctime)s -- P_%(process) -- d_T_%(thread)d ' \ - '- <%(module)s:%(lineno)d>: %(message)s' - -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'formatters': { - 'standard': { - 'format': STANDARD_LOG_FORMAT - }, - 'console': { - 'format': CONSOLE_LOG_FORMAT, - 'datefmt': '%Y-%m-%d %H:%M:%S', - }, - 'file': { - 'format': CONSOLE_LOG_FORMAT, - 'datefmt': '%Y-%m-%d %H:%M:%S', - }, - }, - 'handlers': { - 'file': { - 'level': 'INFO', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': SERVER_LOGS_FILE, - 'maxBytes': 1024 * 1024 * 100, # 100 MB - 'backupCount': 5, # 最多备份5个 - 'formatter': 'standard', - 'encoding': 'utf-8', - }, - 'error': { - 'level': 'ERROR', - 'class': 'logging.handlers.RotatingFileHandler', - 'filename': ERROR_LOGS_FILE, - 'maxBytes': 1024 * 1024 * 100, # 100 MB - 'backupCount': 3, # 最多备份3个 - 'formatter': 'standard', - 'encoding': 'utf-8', - }, - 'console': { - 'level': 'INFO', - 'class': 'logging.StreamHandler', - 'formatter': 'console', - } - }, - 'loggers': { - # default日志 - '': { - 'handlers': ['console', 'error', 'file'], - 'level': 'INFO', - }, - 'django': { - 'handlers': ['console', 'error', 'file'], - 'level': 'INFO', - }, - 'scripts': { - 'handlers': ['console', 'error', 'file'], - 'level': 'INFO', - }, - # 数据库相关日志 - 'django.db.backends': { - 'handlers': [], - 'propagate': True, - 'level': 'INFO', - }, - } -} diff --git a/sysom_server/sysom_api/consumer/consumers.py b/sysom_server/sysom_api/consumer/consumers.py index 1d283a914b911dcec7b98d6a5dcfc2b42d038803..4da09a1527b5676e1358ab51c0c4221c467a04d8 100644 --- a/sysom_server/sysom_api/consumer/consumers.py +++ b/sysom_server/sysom_api/consumer/consumers.py @@ -1,5 +1,4 @@ -import logging -import json +from loguru import logger from threading import Thread from urllib import parse from channels.generic.websocket import WebsocketConsumer, JsonWebsocketConsumer @@ -10,8 +9,6 @@ from django.conf import settings from cec_base.consumer import Consumer, dispatch_consumer -logger = logging.getLogger(__name__) - def get_host_instance(model, **kwargs): """async orm""" diff --git a/sysom_server/sysom_api/consumer/middleware.py b/sysom_server/sysom_api/consumer/middleware.py index b17fb7ea7e90f155f5799333c0da8e4ae9357b4c..433a656b6bd467b2cbdb4f1780614a4750acb779 100644 --- a/sysom_server/sysom_api/consumer/middleware.py +++ b/sysom_server/sysom_api/consumer/middleware.py @@ -1,10 +1,6 @@ -import logging from channels.db import database_sync_to_async -logger = logging.getLogger(__name__) - - @database_sync_to_async def get_user(user_id: int): from apps.accounts.models import User diff --git a/sysom_server/sysom_api/lib/authentications.py b/sysom_server/sysom_api/lib/authentications.py index 582821a24d69aba5a75c804c7d4282e202580d97..86755b1a5d325a6681a01e81198461465722edeb 100644 --- a/sysom_server/sysom_api/lib/authentications.py +++ b/sysom_server/sysom_api/lib/authentications.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import os from typing import List from django.conf import settings @@ -9,8 +9,6 @@ from rest_framework.authentication import BaseAuthentication from .utils import import_module -logger = logging.getLogger(__name__) - def get_jwt_decode_classes() -> List[BaseAuthentication]: jwt_decode_classes = [] @@ -23,7 +21,7 @@ def get_jwt_decode_classes() -> List[BaseAuthentication]: m = getattr(module, 'JWTTokenDecode') jwt_decode_classes.append(m) except Exception as exc: - logger.warn(exc) + logger.warning(exc) return jwt_decode_classes diff --git a/sysom_server/sysom_api/lib/excel.py b/sysom_server/sysom_api/lib/excel.py index 96f57e7ce4cbf1068a03bacd76c3bbcff7ddce5f..e8724f5c0176d8e9c4153810e36397ac6b1dbfc7 100644 --- a/sysom_server/sysom_api/lib/excel.py +++ b/sysom_server/sysom_api/lib/excel.py @@ -1,13 +1,9 @@ -import logging from io import BytesIO import pandas as pd from xlwt import Workbook from django.http import StreamingHttpResponse, HttpResponse -logger = logging.getLogger(__name__) - - class Excel: def __init__(self, file, row_dict: dict) -> None: self.file = file diff --git a/sysom_server/sysom_api/lib/exception.py b/sysom_server/sysom_api/lib/exception.py index f660a9e51d5a17d5d3c0ae13c00f9dec195bd57b..4656c805f7f60be879829bea1d000281a03c775f 100644 --- a/sysom_server/sysom_api/lib/exception.py +++ b/sysom_server/sysom_api/lib/exception.py @@ -1,4 +1,4 @@ -import logging +from loguru import logger import traceback from django.db.models import ProtectedError @@ -9,8 +9,6 @@ from rest_framework.exceptions import APIException as DRFAPIException, Authentic from .response import ErrorResponse -logger = logging.getLogger(__name__) - class APIException(Exception): def __init__(self, code=400, message='API异常', args=('API异常',)): diff --git a/sysom_server/sysom_api/lib/renderers.py b/sysom_server/sysom_api/lib/renderers.py index b24f586fc6354bb1b3c5e3601bd6d5220a8a44a2..5a4b155e99d6402c506e214161674086f1828aed 100644 --- a/sysom_server/sysom_api/lib/renderers.py +++ b/sysom_server/sysom_api/lib/renderers.py @@ -1,4 +1,3 @@ -import logging from django.contrib.auth import get_user_model from django.shortcuts import get_object_or_404 from django.core.handlers.asgi import ASGIRequest @@ -8,7 +7,6 @@ from rest_framework.request import Request from apps.accounts.models import HandlerLog -logger = logging.getLogger(__name__) User = get_user_model() diff --git a/sysom_server/sysom_api/lib/ssh.py b/sysom_server/sysom_api/lib/ssh.py index 9de53fc47747d071aa8d85e3c1ca82fc71d656e6..f04e4da9f15fbca4a931cebc62a6147488a380d8 100644 --- a/sysom_server/sysom_api/lib/ssh.py +++ b/sysom_server/sysom_api/lib/ssh.py @@ -1,4 +1,3 @@ -import logging from typing import Callable import paramiko from io import StringIO @@ -8,8 +7,6 @@ from paramiko.rsakey import RSAKey DEFAULT_CONNENT_TIMEOUT = 5 # 默认ssh链接超时时间 5s DEFAULT_NODE_USER = 'root' # 默认节点用户名 root -logger = logging.getLogger(__name__) - class SSH: """A SSH client used to run command in remote node diff --git a/sysom_server/sysom_api/lib/utils.py b/sysom_server/sysom_api/lib/utils.py index c553c24590b0b7eb558d513bed073b7a8ad0f402..35ae241d4a413c8fd5027fdac274fcdea6995dab 100644 --- a/sysom_server/sysom_api/lib/utils.py +++ b/sysom_server/sysom_api/lib/utils.py @@ -10,9 +10,9 @@ import time import uuid as UUID from typing import List import json -import logging import jwt import requests +from loguru import logger from importlib import import_module from datetime import datetime, date as datetime_date @@ -24,7 +24,6 @@ from paramiko.rsakey import RSAKey from io import StringIO -logger = logging.getLogger(__name__) job_defaults = { 'max_instances': 10,