diff --git a/appStore/cpu2006/views.py b/appStore/cpu2006/views.py index 28b682c6f725702df562b9041cda5a4c9ca89ab5..1c44392cd48c2bd48f07cc66a9b09edeec38ca01 100644 --- a/appStore/cpu2006/views.py +++ b/appStore/cpu2006/views.py @@ -13,6 +13,9 @@ from appStore.cpu2006.serializers import Cpu2006Serializer from appStore.project.models import Project from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class Cpu2006ViewSet(viewsets.ModelViewSet): """ @@ -968,6 +971,8 @@ class Cpu2006ViewSet(viewsets.ModelViewSet): if serializer_cpu2006.is_valid(): self.perform_create(serializer_cpu2006) else: + log.info('cpu2006数据存储错误 :%s,', serializer_cpu2006.errors) + log.info('cpu2006存储数据为 :%s,', data_cpu2006) serializer_cpu2006_errors.append(serializer_cpu2006.errors) error_message.append(get_error_message(serializer_cpu2006)) if serializer_cpu2006_errors: diff --git a/appStore/cpu2017/views.py b/appStore/cpu2017/views.py index 6abd39f73993029724dbf40b999b60ea5e12a450..0bacdaca3b80b9852d7b4ea8d47f970a4c90cd88 100644 --- a/appStore/cpu2017/views.py +++ b/appStore/cpu2017/views.py @@ -15,6 +15,9 @@ from appStore.cpu2017.serializers import Cpu2017Serializer from appStore.project.models import Project from appStore.utils.common import LimsPageSet, json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class Cpu2017ViewSet(viewsets.ModelViewSet): """ @@ -630,7 +633,6 @@ class Cpu2017ViewSet(viewsets.ModelViewSet): column_index += 1 return datas, title_index, column_index, base_column_index - def list(self, request, *args, **kwargs): """ 返回列表 @@ -822,6 +824,8 @@ class Cpu2017ViewSet(viewsets.ModelViewSet): if serializer_cpu2017.is_valid(): self.perform_create(serializer_cpu2017) else: + log.info('cpu2017数据存储错误 :%s,', serializer_cpu2017.errors) + log.info('cpu2017存储数据为 :%s,', data_cpu2017) serializer_cpu2017_errors.append(serializer_cpu2017.errors) error_message.append(get_error_message(serializer_cpu2017)) if serializer_cpu2017_errors: diff --git a/appStore/env/views.py b/appStore/env/views.py index a3585ec05f01bb31da2e9ddf26bdf4097fbd3bc7..952d8cd19b992bb68c663a8eb8e85a1fd1257903 100644 --- a/appStore/env/views.py +++ b/appStore/env/views.py @@ -17,6 +17,9 @@ from appStore.env.serializers import EnvSerializer from appStore.project.models import Project from appStore.utils.common import LimsPageSet, json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class EnvViewSet(viewsets.ModelViewSet): """ env数据管理 @@ -231,6 +234,7 @@ class EnvViewSet(viewsets.ModelViewSet): #查数据库中是否有这条数据,如果有返回对应数据对应的时间戳 filter_env = Env.objects.filter(time=data_env['time']) if filter_env: + log.info('该数据在环境信息表中已存入,环境信息id为 :%s,', filter_env[0].id) return json_response({'env_id':filter_env[0].id}, status.HTTP_400_BAD_REQUEST, '该数据在环境信息表中已存入') data_env['hwinfo_machineinfo_manufacturer'] = request.data['envinfo']['hwinfo']['machineinfo']['manufacturer'] @@ -305,6 +309,8 @@ class EnvViewSet(viewsets.ModelViewSet): self.perform_create(serializer_env) request.data['env_id'] = serializer_env.data['id'] if serializer_env.errors: + log.info('env数据存储错误 :%s,', serializer_env.errors) + log.info('env存储数据为 :%s,', data_env) return json_response(serializer_env.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_env)) if not request.data['env_id']: return json_response({}, status.HTTP_400_BAD_REQUEST, '没有env_id') diff --git a/appStore/errorList/views.py b/appStore/errorList/views.py index 94f231aeefdc484609268745cd549f46a4d38065..32a280c0d2700cbec59456bf86dc8910c205aa99 100644 --- a/appStore/errorList/views.py +++ b/appStore/errorList/views.py @@ -8,10 +8,12 @@ from appStore.errorList.models import KytuningError from appStore.errorList.serializers import ErroirListSerializer from appStore.utils.common import LimsPageSet, json_response - from rest_framework import status, viewsets -# Create your views here. +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + + class ErrorListViewSet(viewsets.ModelViewSet): """ @@ -53,6 +55,8 @@ class ErrorListViewSet(viewsets.ModelViewSet): if config_serializer.is_valid(): self.perform_create(config_serializer) return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功!') + log.info('errorList数据存储错误 :%s,', config_serializer.errors) + log.info('errorList存储数据为 :%s,', error_data) return json_response(config_serializer.errors, status.HTTP_400_BAD_REQUEST, config_serializer.errors) def put(self, request, *args, **kwargs): diff --git a/appStore/fio/views.py b/appStore/fio/views.py index 212782427d528ae8144b472224e8b321303e5eb2..013067cd0bf1b34738e14c284463040794d2af36 100644 --- a/appStore/fio/views.py +++ b/appStore/fio/views.py @@ -12,6 +12,8 @@ from appStore.fio.serializers import FioSerializer from appStore.project.models import Project from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class FioViewSet(viewsets.ModelViewSet): """ @@ -295,6 +297,8 @@ class FioViewSet(viewsets.ModelViewSet): if serializer_fio.is_valid(): self.perform_create(serializer_fio) continue + log.info('fio数据存储错误 :%s,', serializer_fio.errors) + log.info('fio存储数据为 :%s,', data_fio) return json_response(serializer_fio.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_fio)) if serializer_fio_errors: diff --git a/appStore/iozone/views.py b/appStore/iozone/views.py index 242a272e3d85cbf4674d52d5e027d73b2bea0b91..8d809148e544aa47825fe039531f49cab0eaff0d 100644 --- a/appStore/iozone/views.py +++ b/appStore/iozone/views.py @@ -15,6 +15,9 @@ from appStore.iozone.serializers import IozoneSerializer from appStore.project.models import Project from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class IozoneViewSet(viewsets.ModelViewSet): """ @@ -361,6 +364,8 @@ class IozoneViewSet(viewsets.ModelViewSet): if serializer_iozone.is_valid(): self.perform_create(serializer_iozone) else: + log.info('iozone数据存储错误 :%s,', serializer_iozone.errors) + log.info('iozone存储数据为 :%s,', data_iozone) return json_response(serializer_iozone.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_iozone)) if serializer_iozone_errors: diff --git a/appStore/jvm2008/views.py b/appStore/jvm2008/views.py index 6aeb346e6bb64ddc18dc0701db6d08674d13db33..ff4e875addcd8701fc8ca33383d7911b85929583 100644 --- a/appStore/jvm2008/views.py +++ b/appStore/jvm2008/views.py @@ -8,12 +8,14 @@ import numpy as np # Create your views here. from rest_framework import status, viewsets - from appStore.jvm2008.models import Jvm2008 from appStore.jvm2008.serializers import Jvm2008Serializer from appStore.project.models import Project from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class Jvm2008ViewSet(viewsets.ModelViewSet): """ @@ -318,6 +320,8 @@ class Jvm2008ViewSet(viewsets.ModelViewSet): if serializer_jvm2008.is_valid(): self.perform_create(serializer_jvm2008) else: + log.info('jvm2008数据存储错误 :%s,', serializer_jvm2008.errors) + log.info('jvm2008存储数据为 :%s,', data_jvm2008) serializer_jvm2008_errors.append(serializer_jvm2008.errors) errors_message.append(get_error_message(serializer_jvm2008)) if serializer_jvm2008_errors: diff --git a/appStore/lmbench/views.py b/appStore/lmbench/views.py index 1c61e3d99e359c57f31caf7aba5cb424b9cffa2d..3cff51b631cc7bd59448648b4c20550e8903bb80 100644 --- a/appStore/lmbench/views.py +++ b/appStore/lmbench/views.py @@ -8,12 +8,14 @@ import numpy as np # Create your views here. from rest_framework import status, viewsets - from appStore.lmbench.models import Lmbench from appStore.lmbench.serializers import LmbenchSerializer from appStore.project.models import Project from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 + class LmbenchViewSet(viewsets.ModelViewSet): """ @@ -662,6 +664,8 @@ class LmbenchViewSet(viewsets.ModelViewSet): if serializer_lmbench.is_valid(): self.perform_create(serializer_lmbench) else: + log.info('lmbench数据存储错误 :%s,', serializer_lmbench.errors) + log.info('lmbench存储数据为 :%s,', lmbench) serializer_lmbench_error.append(serializer_lmbench.errors) error_message.append(get_error_message(serializer_lmbench)) if serializer_lmbench_error: diff --git a/appStore/project/views.py b/appStore/project/views.py index 9f0de882daa372f4d3e13ac824cb43c5f2b3166f..aed06e29518cccae35cdcc169fe8f981c4259e27 100644 --- a/appStore/project/views.py +++ b/appStore/project/views.py @@ -9,7 +9,7 @@ import os import json import logging - +# Create your views here. from django.http import FileResponse, HttpResponse from rest_framework import status, viewsets from rest_framework.test import APIRequestFactory @@ -25,7 +25,6 @@ from appStore.project.models import Project from appStore.project.serializers import ProjectSerializer from appStore.stream.models import Stream from appStore.unixbench.models import Unixbench -from appStore.users.models import UserProfile from appStore.utils.common import json_response, get_error_message from appStore.utils.export_excel import stream_excel, cpu2017_excel, cpu2006_excel, jvm2008_excel, iozone_excel, \ diff --git a/appStore/stream/views.py b/appStore/stream/views.py index af34cf746ac9892eea5b19ae7ea7d09ef044183e..b07c84b0e62a5e7f87690c939f2592bc4eea948d 100644 --- a/appStore/stream/views.py +++ b/appStore/stream/views.py @@ -8,12 +8,13 @@ import numpy as np # Create your views here. from rest_framework import status, viewsets - from appStore.project.models import Project from appStore.stream.models import Stream from appStore.stream.serializers import StreamSerializer from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class StreamViewSet(viewsets.ModelViewSet): """ @@ -208,6 +209,8 @@ class StreamViewSet(viewsets.ModelViewSet): if serializer_stream.is_valid(): self.perform_create(serializer_stream) else: + log.info('stram数据存储错误 :%s,', serializer_stream.errors) + log.info('stream存储数据为 :%s,', data_stream) serializer_stream_errors.append(serializer_stream.errors) error_message.append(get_error_message(serializer_stream)) diff --git a/appStore/testCase/views.py b/appStore/testCase/views.py index bbf10d9fe8339601332893c6fae13f0a5c8bbe1d..cb1b4f2d249162451da62d890b4e923b20f881a7 100644 --- a/appStore/testCase/views.py +++ b/appStore/testCase/views.py @@ -10,17 +10,16 @@ import os import shutil import subprocess import time - +# Create your views here. from django.http import HttpResponse, FileResponse, HttpRequest - from appStore.testCase.models import TestCase from appStore.testCase.serializers import TestCaseSerializer from appStore.utils.common import test_case, json_response, get_error_message from appStore.utils.constants import RESULT_LOG_FILE, RUN_KYTUNING_CONFIG_TEMP, TOOLS_URL, KYTUNING_WEB_URL from rest_framework import status, viewsets - -# Create your views here. +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class TestCaseViewSet(viewsets.ModelViewSet): """ @@ -145,6 +144,8 @@ class TestCaseViewSet(viewsets.ModelViewSet): self.perform_create(serializer_test_case) test_case_id = serializer_test_case.data['id'] else: + log.info('testCase数据存储错误 :%s,', serializer_test_case.errors) + log.info('testCase存储数据为 :%s,', data_test_case) return json_response(serializer_test_case.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer_test_case)) """保存至配置管理数据库""" diff --git a/appStore/testMachine/views.py b/appStore/testMachine/views.py index ba1fb11dd5523e541100c9f08d28c5cdb99fe2c1..e12de155409912d26b07cf05b3f7ae5eed46dc5e 100644 --- a/appStore/testMachine/views.py +++ b/appStore/testMachine/views.py @@ -8,11 +8,10 @@ from appStore.testMachine.models import TestMachine from appStore.testMachine.serializers import TestMachineSerializer from rest_framework import status, viewsets - from appStore.utils.common import json_response, get_link_status - -# Create your views here. +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class TestMachineViewSet(viewsets.ModelViewSet): """ @@ -40,6 +39,8 @@ class TestMachineViewSet(viewsets.ModelViewSet): if config_serializer.is_valid(): self.perform_create(config_serializer) return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功!') + log.info('Machine数据存储错误 :%s,', config_serializer.errors) + log.info('Machine存储数据为 :%s,', machine_data) return json_response(config_serializer.errors, status.HTTP_400_BAD_REQUEST, config_serializer.errors) def put(self, request, *args, **kwargs): diff --git a/appStore/unixbench/views.py b/appStore/unixbench/views.py index 01f598d8796008e13dab782df087ba00931f116e..8b72793423a65ace062b47a17deef19131eb9d1c 100644 --- a/appStore/unixbench/views.py +++ b/appStore/unixbench/views.py @@ -7,13 +7,15 @@ """ # Create your views here. import numpy as np +# Create your views here. from rest_framework import status, viewsets - from appStore.project.models import Project from appStore.unixbench.models import Unixbench from appStore.unixbench.serializers import UnixbenchSerializer from appStore.utils.common import json_response, get_error_message +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class UnixbenchViewSet(viewsets.ModelViewSet): """ @@ -421,6 +423,8 @@ class UnixbenchViewSet(viewsets.ModelViewSet): if serializer_unixbench.is_valid(): self.perform_create(serializer_unixbench) else: + log.info('unixbench数据存储错误 :%s,', serializer_unixbench.errors) + log.info('unixbench存储数据为 :%s,', data_unixbench) serializer_unixbench_errors.append(serializer_unixbench.errors) error_message.append(get_error_message(serializer_unixbench)) if serializer_unixbench_errors: diff --git a/appStore/userConfig/views.py b/appStore/userConfig/views.py index a47d79b1fbde41dd660b25227aa95583d7e8d495..fd3908865e3e29d3f14cc5d7ee63a4716708ab5f 100644 --- a/appStore/userConfig/views.py +++ b/appStore/userConfig/views.py @@ -10,8 +10,8 @@ from appStore.userConfig.models import UserConfig from appStore.userConfig.serializers import UserConfigSerializer from appStore.utils.common import json_response - -# Create your views here. +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class UserConfigViewSet(viewsets.ModelViewSet): """ @@ -36,6 +36,7 @@ class UserConfigViewSet(viewsets.ModelViewSet): def create(self, request, *args, **kwargs): user_config_data = {} user_config_data['user_name'] = request.user.chinese_name + # user_config_data['user_password'] = request.data.get('user_password') user_config_data['config_name'] = request.data.get('config_name') user_config_data['project_name'] = request.data.get('project_name') user_config_data['test_ip'] = request.data.get('test_ip') @@ -66,6 +67,8 @@ class UserConfigViewSet(viewsets.ModelViewSet): if config_serializer.is_valid(): self.perform_create(config_serializer) return json_response(config_serializer.data, status.HTTP_200_OK, '创建成功!') + log.info('userConfig数据存储错误 :%s,', config_serializer.errors) + log.info('userConfig存储数据为 :%s,', user_config_data) return json_response({}, status.HTTP_400_BAD_REQUEST, config_serializer.errors) def put(self, request, *args, **kwargs): @@ -78,6 +81,7 @@ class UserConfigViewSet(viewsets.ModelViewSet): if not config_data: return json_response({}, status.HTTP_205_RESET_CONTENT, '没有该数据') config_data.config_name = request.data.get('config_name') + # config_data.user_password = request.data.get('user_password') config_data.project_name = request.data.get('project_name') config_data.test_ip = request.data.get('test_ip') config_data.test_password = request.data.get('test_password') diff --git a/appStore/users/views.py b/appStore/users/views.py index 80170b665232c655a03bfc827f8841369111abe1..f265c3fa9e3dadc7c8d26a45d82809ba736ee360 100644 --- a/appStore/users/views.py +++ b/appStore/users/views.py @@ -9,12 +9,20 @@ from appStore.users.models import UserProfile from rest_framework import status, viewsets from appStore.users.serializers import UserProfileSerializer from appStore.utils.common import json_response, get_error_message -# Create your views here. + +import logging +log = logging.getLogger('mydjango') #这里的mydjango是settings中loggers里面对应的名字 class UserProfileViewSet(viewsets.ModelViewSet): """ 用户数据管理 """ + # permission_classes = (ZbmPermission,) + # authentication_classes = (JSONWebTokenAuthentication, SessionAuthentication) + # queryset = UserProfile.objects.all().order_by('-id') + # serializer_class = UserSerializer + # pagination_class = LimsPageSet + queryset = UserProfile.objects.all().order_by('-id') serializer_class = UserProfileSerializer @@ -27,6 +35,7 @@ class UserProfileViewSet(viewsets.ModelViewSet): # 可以根据需要设置其他用户属性 user.save() return json_response(serializer.data, status.HTTP_200_OK, '创建成功!') + log.info('user数据存储错误 :%s,', serializer.errors) return json_response(serializer.errors, status.HTTP_400_BAD_REQUEST, get_error_message(serializer)) diff --git a/appStore/utils/constants.py b/appStore/utils/constants.py index 25db6664b59cd0031f125e3a1929f36c82666507..a4ed43c1b33017de702e798d107a3539f8063bbc 100644 --- a/appStore/utils/constants.py +++ b/appStore/utils/constants.py @@ -6,7 +6,7 @@ * Date: Fri Feb 23 10:00:37 2024 +0800 """ # 后端项目运行日志存放路径 -LOGGING_DIR = "/opt/kytuning/logs" +LOGGING_DIR = "/var/log/kytuning/" # 服务端记录测试端的测试日志路径 RESULT_LOG_FILE = '/var/www/html/result_log_file/'