Merge pull request #111 from lihuacai168/feat/save-log

feat(system): save all log

FasterRunner/log.py

@@ -0,0 +1,18 @@
+# !/usr/bin/python3
+# -*- coding: utf-8 -*-
+
+# @Author: 花菜
+# @File: log.py
+# @Time : 2023/9/17 22:25
+# @Email: lihuacai168@gmail.com
+
+import logging
+
+class DatabaseLogHandler(logging.Handler):
+    def emit(self, record: logging.LogRecord) -> None:
+        from system.models import LogRecord  # 引入上面定义的LogRecord模型
+        LogRecord.objects.create(
+            request_id=record.request_id,
+            level=record.levelname,
+            message=self.format(record),
+        )

FasterRunner/settings/base.py

@@ -56,6 +56,7 @@
     "django_celery_beat",
     "rest_framework_swagger",
     "drf_yasg",
+    "system",
 ]
 
 MIDDLEWARE = [
@@ -232,8 +233,7 @@
     "disable_existing_loggers": True,
     "formatters": {
         "standard": {
-            "format": "%(levelname)-2s [%(asctime)s] [%(request_id)s] %(name)s: %(message)s",
-            "datefmt": "%Y-%m-%d %H:%M:%S",
+            "format": "%(levelname)-2s [%(asctime)s] [%(request_id)s] %(name)s [%(filename)s->%(funcName)s:%(lineno)s]:  %(message)s",
         },
         "color": {
             "()": "colorlog.ColoredFormatter",
@@ -287,20 +287,25 @@
             "formatter": "color",
             "filters": ["request_id"],
         },
+        'db': {
+            'level': 'INFO',
+            "formatter": "standard",
+            'class': 'FasterRunner.log.DatabaseLogHandler',  # 指向你的自定义处理器
+        },
     },
     "loggers": {
         "django": {
-            "handlers": ["default", "console", "error"],
+            "handlers": ["default", "console", "error", "db"],
             "level": "INFO",
             "propagate": True,
         },
         "fastrunner": {
-            "handlers": ["default", "console", "error"],
+            "handlers": ["default", "console", "error", "db"],
             "level": "INFO",
             "propagate": True,
         },
         "httprunner": {
-            "handlers": ["default", "console", "error"],
+            "handlers": ["default", "console", "error", "db"],
             "level": "INFO",
             "propagate": True,
         },

db/init.sql

@@ -1329,6 +1329,20 @@ CREATE TABLE `visit` (
 ) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+DROP TABLE IF EXISTS `log_record`;
+CREATE TABLE `log_record` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `create_time` datetime(6) NOT NULL,
+  `update_time` datetime(6) NOT NULL,
+  `creator` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `updater` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `request_id` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `level` varchar(20) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `message` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `log_record_request_id_b763ce6d` (`request_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
 --
 -- Dumping data for table `visit`
 --

system/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

system/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class SystemConfig(AppConfig):
+    name = 'system'

system/migrations/0001_initial.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.17 on 2023-09-17 22:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='LogRecord',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(auto_now_add=True, verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, verbose_name='更新时间')),
+                ('creator', models.CharField(max_length=20, null=True, verbose_name='创建人')),
+                ('updater', models.CharField(max_length=20, null=True, verbose_name='更新人')),
+                ('request_id', models.CharField(db_index=True, max_length=100, null=True)),
+                ('level', models.CharField(max_length=20)),
+                ('message', models.TextField(db_index=True)),
+            ],
+            options={
+                'db_table': 'log_record',
+            },
+        ),
+    ]

system/models.py

@@ -0,0 +1,15 @@
+from django.db import models
+
+from fastuser.models import BaseTable
+
+
+# Create your models here.
+
+
+class LogRecord(BaseTable):
+    class Meta:
+        db_table = "log_record"
+    request_id = models.CharField(max_length=100, null=True, db_index=True)
+    level = models.CharField(max_length=20)
+    message = models.TextField(db_index=True)
+

system/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

system/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

web/.dockerignore

@@ -1,4 +1,8 @@
+.git
+**/*.log
+**/*-log-*
+**/*.tar.gz
 Dockerfile
 .dockerignore
-node_modules
-dist
+*.md
+node_modules/