10. [APIs: all]: 添加了 logger.setLevel(INFO),只有添加这个,单个模块内才生效

This commit is contained in:
gitea 2024-08-01 19:15:08 +08:00
parent 60726d9d07
commit 340d48876b
12 changed files with 33 additions and 24 deletions

View File

@ -595,3 +595,4 @@ v0.2.0.5(2024/07/31)
9. [APIs: do_brake.py] 9. [APIs: do_brake.py]
- 修改获取初始速度的逻辑只获取configs文件中配置的时间内的速度 - 修改获取初始速度的逻辑只获取configs文件中配置的时间内的速度
- 新增 configs 参数 single_brake可针对特定条件做测试 - 新增 configs 参数 single_brake可针对特定条件做测试
10. [APIs: all]: 添加了 logger.setLevel(INFO),只有添加这个,单个模块内才生效

View File

@ -14,7 +14,7 @@ from commons import openapi, clibs
from matplotlib.pyplot import rcParams, figure, subplots_adjust, close from matplotlib.pyplot import rcParams, figure, subplots_adjust, close
from matplotlib import use from matplotlib import use
from pandas import DataFrame, read_excel from pandas import DataFrame, read_excel
import logging from logging import getLogger, INFO
with open(clibs.log_data, 'w') as _: with open(clibs.log_data, 'w') as _:
for i in range(1, 11): for i in range(1, 11):
@ -22,7 +22,8 @@ with open(clibs.log_data, 'w') as _:
remove(f'{clibs.log_data}.{i}') remove(f'{clibs.log_data}.{i}')
except FileNotFoundError: except FileNotFoundError:
pass pass
logger = logging.getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
logger.info("日志文件初始化完成...") logger.info("日志文件初始化完成...")
use('Agg') use('Agg')

View File

@ -1,10 +1,11 @@
from json import loads from json import loads
from sys import argv from sys import argv
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
tab_name = clibs.tab_names['at'] tab_name = clibs.tab_names['at']
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def trigger_estop(md, w2t): def trigger_estop(md, w2t):

View File

@ -5,11 +5,12 @@ from paramiko import SSHClient, AutoAddPolicy
from json import loads from json import loads
from openpyxl import load_workbook from openpyxl import load_workbook
from pandas import DataFrame, concat from pandas import DataFrame, concat
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
tab_name = clibs.tab_names['at'] tab_name = clibs.tab_names['at']
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def check_files(path, loadsel, data_dirs, data_files, w2t): def check_files(path, loadsel, data_dirs, data_files, w2t):
@ -105,7 +106,7 @@ def run_rl(path, loadsel, hr, md, config_file, result_dirs, w2t):
ws = wb['Target'] ws = wb['Target']
write_diagnosis = float(ws.cell(row=3, column=10).value) write_diagnosis = float(ws.cell(row=3, column=10).value)
get_init_speed = float(ws.cell(row=4, column=10).value) get_init_speed = float(ws.cell(row=4, column=10).value)
single_brake = ws.cell(row=5, column=10).value single_brake = str(ws.cell(row=5, column=10).value)
if ws.cell(row=1, column=1).value == 'positive': if ws.cell(row=1, column=1).value == 'positive':
md.write_pon(1) md.write_pon(1)

View File

@ -4,10 +4,12 @@ from sys import argv
from paramiko import SSHClient, AutoAddPolicy from paramiko import SSHClient, AutoAddPolicy
from json import loads from json import loads
from pandas import DataFrame, concat from pandas import DataFrame, concat
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
tab_name = clibs.tab_names['at'] tab_name = clibs.tab_names['at']
display_pdo_params = [ display_pdo_params = [
{"name": "hw_joint_vel_feedback", "channel": 0}, {"name": "hw_joint_vel_feedback", "channel": 0},

View File

@ -38,21 +38,16 @@ durable_data_current_max = {
'axis6': [0 for _ in range(18)], 'axis6': [0 for _ in range(18)],
} }
fmt = Formatter('%(asctime)s # %(levelname)s-%(filename)s-%(funcName)s # %(message)s')
# file_handler = logging.FileHandler(log_data)
# file_handler = RotatingFileHandler(filename=log_data, backupCount=10, maxBytes=50*1024*1024, encoding='utf-8')
file_handler = ConcurrentRotatingFileHandler(filename=log_data, backupCount=10, maxBytes=50*1024*1024, encoding='utf-8') file_handler = ConcurrentRotatingFileHandler(filename=log_data, backupCount=10, maxBytes=50*1024*1024, encoding='utf-8')
file_handler.setFormatter(fmt)
file_handler.setLevel(INFO) file_handler.setLevel(INFO)
console_handler = StreamHandler() console_handler = StreamHandler()
console_handler.setFormatter(fmt) console_handler.setLevel(WARNING)
console_handler.setLevel(ERROR)
# basicConfig(level=WARNING, # for product basicConfig( # level=INFO,
basicConfig(level=WARNING,
datefmt='%Y-%m-%dT%H:%M:%S', datefmt='%Y-%m-%dT%H:%M:%S',
# handlers=[file_handler]) # for product format='%(asctime)s # %(levelname)s-%(filename)s-%(funcName)s # %(message)s',
handlers=[file_handler, console_handler]) handlers=[file_handler, console_handler],
)
class GetThreadResult(Thread): class GetThreadResult(Thread):

View File

@ -6,10 +6,12 @@ from time import time, sleep
from pymodbus.client.tcp import ModbusTcpClient from pymodbus.client.tcp import ModbusTcpClient
from pymodbus.payload import BinaryPayloadDecoder, BinaryPayloadBuilder from pymodbus.payload import BinaryPayloadDecoder, BinaryPayloadBuilder
from pymodbus.constants import Endian from pymodbus.constants import Endian
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
class ModbusRequest(object): class ModbusRequest(object):
def __init__(self, w2t): def __init__(self, w2t):
@ -261,7 +263,7 @@ class HmiRequest(object):
def msg_storage(self, response, flag=0): def msg_storage(self, response, flag=0):
# response是解码后的字符串 # response是解码后的字符串
messages = self.c_msg if flag == 0 else self.c_msg_xs messages = self.c_msg if flag == 0 else self.c_msg_xs
logger.warning(f"{loads(response)}") logger.info(f"{loads(response)}")
if 'move.monitor' in response: if 'move.monitor' in response:
pass pass
elif len(messages) < 10000: elif len(messages) < 10000:

View File

@ -5,10 +5,11 @@ from openpyxl import load_workbook
from time import time, sleep, strftime, localtime from time import time, sleep, strftime, localtime
from threading import Thread from threading import Thread
from pandas import read_csv from pandas import read_csv
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def check_files(path, raw_data_dirs, result_files, w2t): def check_files(path, raw_data_dirs, result_files, w2t):

View File

@ -5,10 +5,11 @@ from re import match
from threading import Thread from threading import Thread
from time import sleep from time import sleep
from csv import reader, writer from csv import reader, writer
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def w2t_local(msg, wait, w2t): def w2t_local(msg, wait, w2t):

View File

@ -3,10 +3,11 @@ import pdfplumber
from openpyxl import load_workbook from openpyxl import load_workbook
from os import remove from os import remove
from sys import argv from sys import argv
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def p_iso(file, p_files, ws, tmpfile): def p_iso(file, p_files, ws, tmpfile):

View File

@ -2,10 +2,11 @@ from pandas import read_csv
from csv import reader from csv import reader
from sys import argv from sys import argv
from openpyxl import Workbook from openpyxl import Workbook
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
def find_point(bof, step, pos, data_file, flag, df, row, w2t): def find_point(bof, step, pos, data_file, flag, df, row, w2t):

View File

@ -6,10 +6,12 @@ from openpyxl import load_workbook
from math import sqrt from math import sqrt
from numpy import power from numpy import power
from csv import writer from csv import writer
from logging import getLogger from logging import getLogger, INFO
from commons import clibs from commons import clibs
logger = getLogger(__file__) logger = getLogger(__file__)
logger.setLevel(INFO)
tab_name = clibs.tab_names['da'] tab_name = clibs.tab_names['da']
count = 0 count = 0
display_pdo_params = [ display_pdo_params = [