Skip to content
Snippets Groups Projects
Commit db2f6f7d authored by KERDREUX Jerome's avatar KERDREUX Jerome
Browse files

Formating, fix ruff errors

parent 28f1f018
Branches
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@ def singleton(class_):
@decorator
def timeit(method,*args,**kwargs):
def timeit(method, *args, **kwargs):
logger = logging.getLogger(__name__)
ts = time.time()
result = method(*args, **kwargs)
......@@ -32,14 +32,14 @@ def timeit(method,*args,**kwargs):
def set_console_title(value):
# set xterm title
print("\x1B]0;xAAL => %s\x07" % value,end='\r')
print("\x1B]0;xAAL => %s\x07" % value, end='\r')
def setup_console_logger(level=config.log_level):
fmt = '%(asctime)s %(name)-25s %(funcName)-18s %(levelname)-8s %(message)s'
#fmt = '[%(name)s] %(funcName)s %(levelname)s: %(message)s'
coloredlogs.install(level=level,fmt=fmt)
def setup_file_logger(name,level=config.log_level,filename = None):
def setup_file_logger(name,level=config.log_level, filename = None):
filename = filename or os.path.join(config.log_path,'%s.log' % name)
formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(name)s - %(message)s')
handler = logging.handlers.RotatingFileHandler(filename, 'a', 10000, 1, 'utf8')
......@@ -56,7 +56,7 @@ def setup_file_logger(name,level=config.log_level,filename = None):
#
# Default arguments console_log and file_log are (and should) never be used.
# ---------------------------------------------------------------------------
def run_package(pkg_name,pkg_setup,console_log = True,file_log=False):
def run_package(pkg_name, pkg_setup, console_log = True, file_log=False):
if console_log:
set_console_title(pkg_name)
setup_console_logger()
......@@ -69,7 +69,7 @@ def run_package(pkg_name,pkg_setup,console_log = True,file_log=False):
eng = Engine()
result = pkg_setup(eng)
if result != True:
if result is True:
logger.critical("something goes wrong with package: %s" % pkg_name)
try:
eng.run()
......
......@@ -22,11 +22,11 @@ import socket
import struct
import select
import logging
import time
from enum import Enum
logger = logging.getLogger(__name__)
import time
from enum import Enum
class NetworkState(Enum):
disconnected = 0
......@@ -81,14 +81,16 @@ class NetworkConnector(object):
return None
def get_data(self):
if not self.is_connected(): self.connect()
if not self.is_connected():
self.connect()
try:
return self.__get_data()
except Exception as e:
self.network_error(e)
def send(self,data):
if not self.is_connected(): self.connect()
if not self.is_connected():
self.connect()
try:
self.__sock.sendto(data, (self.addr, self.port))
except Exception as e:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment