548dc7a0 by 周伟奇

Merge branch 'feature/main2' into feature/main

2 parents 789a7f2c 306566d4
...@@ -642,6 +642,9 @@ class Command(BaseCommand, LoggerMixin): ...@@ -642,6 +642,9 @@ class Command(BaseCommand, LoggerMixin):
642 unknown_summary, license_summary)) 642 unknown_summary, license_summary))
643 643
644 self.license_log.info('[license_summary={0}]'.format(license_summary)) 644 self.license_log.info('[license_summary={0}]'.format(license_summary))
645 idcard_list = license_summary.get(consts.IC_CLASSIFY)
646 if idcard_list:
647 self.idcard_log.info('[idcard={0}]'.format(idcard_list))
645 648
646 merged_bs_summary = self.rebuild_bs_summary(bs_summary, unknown_summary) 649 merged_bs_summary = self.rebuild_bs_summary(bs_summary, unknown_summary)
647 650
......
...@@ -42,6 +42,7 @@ class LoggerMixin: ...@@ -42,6 +42,7 @@ class LoggerMixin:
42 folder_log = logging.getLogger('folder') 42 folder_log = logging.getLogger('folder')
43 bs_log = logging.getLogger('bs') 43 bs_log = logging.getLogger('bs')
44 license_log = logging.getLogger('license') 44 license_log = logging.getLogger('license')
45 idcard_log = logging.getLogger('idcard')
45 46
46 47
47 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView): 48 class GenericView(LoggerMixin, GenericExceptionMixin, GenericAPIView):
......
1 [loggers] 1 [loggers]
2 keys=root, running, exception, cronjob, folder, bs, license, django.db.backends 2 keys=root, running, exception, cronjob, folder, bs, license, idcard, django.db.backends
3 3
4 [handlers] 4 [handlers]
5 keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, folderFileHandler, bsFileHandler, licenseFileHandler, djangodbFileHandler 5 keys=consoleHandler, django_rotateFileHandler, exceptionFileHandler, cronjobFileHandler, folderFileHandler, bsFileHandler, licenseFileHandler, idcardFileHandler, djangodbFileHandler
6 6
7 [formatters] 7 [formatters]
8 keys=SituFormatter, dataLogFormatter, SimpleFormatter 8 keys=SituFormatter, dataLogFormatter, SimpleFormatter
...@@ -61,6 +61,12 @@ level=DEBUG ...@@ -61,6 +61,12 @@ level=DEBUG
61 formatter=SimpleFormatter 61 formatter=SimpleFormatter
62 args=('../logs/license_statistics.log',) 62 args=('../logs/license_statistics.log',)
63 63
64 [handler_idcardFileHandler]
65 class=situlogger.SituRotatingFileHandler
66 level=DEBUG
67 formatter=SimpleFormatter
68 args=('../logs/idcard.log',)
69
64 [handler_djangodbFileHandler] 70 [handler_djangodbFileHandler]
65 class=situlogger.SituRotatingFileHandler 71 class=situlogger.SituRotatingFileHandler
66 level=DEBUG 72 level=DEBUG
...@@ -107,6 +113,12 @@ handlers=licenseFileHandler ...@@ -107,6 +113,12 @@ handlers=licenseFileHandler
107 qualname=license 113 qualname=license
108 propagate=0 114 propagate=0
109 115
116 [logger_idcard]
117 level=INFO
118 handlers=idcardFileHandler
119 qualname=idcard
120 propagate=0
121
110 [logger_django.db.backends] 122 [logger_django.db.backends]
111 level=DEBUG 123 level=DEBUG
112 handlers=djangodbFileHandler 124 handlers=djangodbFileHandler
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!