Skip to content

Commit 233785a

Browse files
authored
fixed wheelhouse.yml (#1255)
* fixed wheelhouse.yml * Improve formatter * Added Unit Tests for formatter Co-authored-by: maxcapodi78 <Shark78>
1 parent e8f8306 commit 233785a

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

.github/workflows/wheelhouse.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,4 @@ jobs:
8585
with:
8686
generate_release_notes: true
8787
files: |
88-
./**/*.tar.gz
8988
${{ env.PACKAGE_NAME }}-v${{ steps.version.outputs.PYAEDT_VERSION }}-wheelhouse-${{ runner.os }}-${{ matrix.python-version }}.zip

_unittest/test_14_AedtLogger.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,19 @@ def teardown_class(self):
100100
# logger.clear_messages("", "", 2)
101101
# assert not logger.get_messages().global_level
102102

103+
def test_01_formatter(self):
104+
settings.formatter = logging.Formatter(
105+
fmt="%(asctime)s (%(levelname)s) %(message)s", datefmt="%d.%m.%Y %H:%M:%S"
106+
)
107+
temp_dir = tempfile.gettempdir()
108+
logging_dir = os.path.join(temp_dir, "log_testing")
109+
if not os.path.exists(logging_dir):
110+
os.makedirs(logging_dir)
111+
path = os.path.join(logging_dir, "test01.txt")
112+
logger = AedtLogger(filename=path)
113+
assert logger.formatter == settings.formatter
114+
settings.formatter = None
115+
103116
def test_02_output_file_with_app_filter(self):
104117
content = None
105118
temp_dir = tempfile.gettempdir()

pyaedt/aedt_logger.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import logging
22
import sys
33

4-
from pyaedt import is_ironpython
54
from pyaedt import log_handler
65
from pyaedt import settings
76

@@ -124,13 +123,15 @@ def __init__(self, level=logging.DEBUG, filename=None, to_stdout=False):
124123
self.level = level
125124
self.filename = filename or settings.logger_file_path
126125
settings.logger_file_path = self.filename
127-
if is_ironpython:
128-
logging.basicConfig()
126+
# if is_ironpython:
127+
# logging.basicConfig()
129128
self._global = logging.getLogger("Global")
130129
self._file_handler = None
131130
self._std_out_handler = None
132-
self.formatter = logging.Formatter(settings.logger_formatter, datefmt=settings.logger_datefmt)
133-
131+
if settings.formatter:
132+
self.formatter = settings.formatter
133+
else:
134+
self.formatter = logging.Formatter(settings.logger_formatter, datefmt=settings.logger_datefmt)
134135
if not settings.enable_logger:
135136
self._global.addHandler(logging.NullHandler())
136137
return

pyaedt/generic/general_methods.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,7 @@ def __init__(self):
707707
self._use_grpc_api = False
708708
self.machine = ""
709709
self.port = 0
710+
self.formatter = None
710711

711712
@property
712713
def use_grpc_api(self):

0 commit comments

Comments
 (0)