Skip to content

Commit 8a3d6fe

Browse files
authored
Move errors to warnings when the code passes through (#429)
When the code passes the error and has work arounds or alternative routes, lower the level so it's recorded in the logger debugging, not error / warning. This ensures that tests pass, since currently some fail due to spurious "error" messages
1 parent 7e0104a commit 8a3d6fe

File tree

2 files changed

+21
-35
lines changed

2 files changed

+21
-35
lines changed

src/ansys/dynamicreporting/core/utils/report_objects.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def map_ensight_plot_to_table_dictionary(p):
177177
try:
178178
a[a == ensight.Undefined] = numpy.nan
179179
except Exception as e:
180-
logger.error(f"Error: {str(e)}.\n")
180+
logger.debug(f"Warning: {str(e)}.\n")
181181
pass
182182
max_columns = max(a.shape[1], max_columns)
183183
d = dict(array=a, yname=q.LEGENDTITLE, xname=x_axis_title)
@@ -405,7 +405,7 @@ def get_params(self):
405405
try:
406406
return json.loads(self.params)
407407
except Exception as e:
408-
logger.error(f"Error: {str(e)}.\n")
408+
logger.debug(f"Warning on get_params: {str(e)}.\n")
409409
return {}
410410

411411
def set_params(self, d: dict = None):
@@ -1333,7 +1333,7 @@ def set_payload_image(self, img):
13331333
try:
13341334
from . import png
13351335
except Exception as e:
1336-
logger.error(f"Error: {str(e)}.\n")
1336+
logger.debug(f"Warning: {str(e)}.\n")
13371337
import png
13381338
try:
13391339
# we can only read png images as string content (not filename)
@@ -1354,7 +1354,7 @@ def set_payload_image(self, img):
13541354
palette=pngobj[3].get("palette", None),
13551355
)
13561356
except Exception as e:
1357-
logger.error(f"Error: {str(e)}.\n")
1357+
logger.debug(f"Warning: {str(e)}.\n")
13581358
# enhanced images will fall into this case
13591359
data = report_utils.PIL_image_to_data(img)
13601360
self.width = data["width"]
@@ -1512,14 +1512,14 @@ def add_params(self, d: dict = None):
15121512
self.params = json.dumps(tmp_params)
15131513
return
15141514
except Exception as e:
1515-
logger.error(f"Error: {str(e)}.\n")
1515+
logger.debug(f"Warning on add_params: {str(e)}.\n")
15161516
return {}
15171517

15181518
def get_params(self):
15191519
try:
15201520
return json.loads(self.params)
15211521
except Exception as e:
1522-
logger.error(f"Error: {str(e)}.\n")
1522+
logger.debug(f"Warning on get_params: {str(e)}.\n")
15231523
return {}
15241524

15251525
def set_params(self, d: dict = None):

src/ansys/dynamicreporting/core/utils/report_remote_server.py

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,6 @@
4040
logger = logging.getLogger("ansys.dynamicreporting.core")
4141

4242

43-
def disable_warn_logging(func):
44-
# Decorator to suppress harmless warning messages
45-
@functools.wraps(func)
46-
def wrapper(*args, **kwargs):
47-
logging.disable(logging.WARNING)
48-
try:
49-
return func(*args, **kwargs)
50-
finally:
51-
logging.disable(logging.NOTSET)
52-
53-
return wrapper
54-
55-
5643
def print_allowed():
5744
# Note: calling print() from a pythonw interpreter (e.g. template_editor launched
5845
# via the icon) can cause the interpreter to crash. We will allow print, but only
@@ -249,7 +236,6 @@ def valid_database(self):
249236
return True
250237
return False
251238

252-
@disable_warn_logging
253239
def get_api_version(self):
254240
url = self.get_URL()
255241
if url is None:
@@ -269,7 +255,7 @@ def get_server_name(self):
269255
try:
270256
self.validate()
271257
except Exception as e:
272-
logger.warning(f"Error: {str(e)}")
258+
logger.debug(f"Warning: {str(e)}")
273259
pass
274260
if self.cur_servername is None:
275261
return self.get_URL()
@@ -295,7 +281,7 @@ def stop_server_allowed(self):
295281
if not result.ok:
296282
return False
297283
except Exception as e:
298-
logger.warning(f"Error: {str(e)}")
284+
logger.debug(f"Warning: {str(e)}")
299285
return False
300286
return True
301287

@@ -309,7 +295,7 @@ def stop_local_server(self):
309295
# note this request will fail as it does not return anything!!!
310296
self._http_session.get(url, auth=auth)
311297
except Exception as e:
312-
logger.warning(f"Error: {str(e)}")
298+
logger.debug(f"Warning: {str(e)}")
313299
pass
314300
self.set_URL(None)
315301
self.set_password(None)
@@ -332,7 +318,7 @@ def get_user_groups(self):
332318
try:
333319
return [str(obj_data.get("name")) for obj_data in r.json()]
334320
except Exception as e:
335-
logger.warning(f"Error: {str(e)}")
321+
logger.debug(f"Warning: {str(e)}")
336322
return []
337323

338324
def get_object_guids(self, objtype=report_objects.Template, query=None):
@@ -360,7 +346,7 @@ def get_object_guids(self, objtype=report_objects.Template, query=None):
360346
else:
361347
return [str(i) for i in r.json()["guid_list"]]
362348
except Exception as e:
363-
logger.warning(f"Error: {str(e)}")
349+
logger.debug(f"Warning: {str(e)}")
364350
return []
365351

366352
def get_objects(self, objtype=report_objects.Template, query=None):
@@ -396,7 +382,7 @@ def get_objects(self, objtype=report_objects.Template, query=None):
396382
ret.append(t)
397383
return ret
398384
except Exception as e:
399-
logger.warning(f"Error: {str(e)}")
385+
logger.debug(f"Warning: {str(e)}")
400386
return []
401387

402388
def get_object_from_guid(self, guid, objtype=report_objects.TemplateREST):
@@ -422,7 +408,7 @@ def get_object_from_guid(self, guid, objtype=report_objects.TemplateREST):
422408
obj.from_json(r.json())
423409
return obj
424410
except Exception as e:
425-
logger.warning(f"Error: {str(e)}")
411+
logger.debug(f"Warning: {str(e)}")
426412
return None
427413

428414
def _get_push_request_info(self, obj):
@@ -551,7 +537,7 @@ def put_objects(self, in_objects):
551537
try:
552538
r = self._http_session.put(url, auth=auth, files=files)
553539
except Exception as e:
554-
logger.warning(f"Error: {str(e)}")
540+
logger.debug(f"Warning: {str(e)}")
555541
r = self._http_session.Response()
556542
r.status_code = requests.codes.client_closed_request
557543
ret = r.status_code
@@ -1236,7 +1222,7 @@ def create_new_local_database(
12361222
group.save()
12371223
os.makedirs(os.path.join(db_dir, "media"))
12381224
except Exception as e:
1239-
logger.warning(f"Error: {str(e)}")
1225+
logger.debug(f"Warning: {str(e)}")
12401226
error = True
12411227
if parent and has_qt:
12421228
QtWidgets.QApplication.restoreOverrideCursor()
@@ -1394,7 +1380,7 @@ def validate_local_db_version(db_dir, version_max=None, version_min=None):
13941380
if number < version_min:
13951381
return False
13961382
except Exception as e:
1397-
logger.warning(f"Error: {str(e)}")
1383+
logger.debug(f"Warning: {str(e)}")
13981384
return False
13991385
return True
14001386

@@ -1547,7 +1533,7 @@ def launch_local_database_server(
15471533
local_lock = filelock.nexus_file_lock(api_lock_filename)
15481534
local_lock.acquire()
15491535
except Exception as e:
1550-
logger.warning(f"Error: {str(e)}")
1536+
logger.debug(f"Warning: {str(e)}")
15511537
pass
15521538
# We may need to do port scanning
15531539
if port is None: # nosec
@@ -1558,7 +1544,7 @@ def launch_local_database_server(
15581544
scanning_lock = filelock.nexus_file_lock(lock_filename)
15591545
scanning_lock.acquire()
15601546
except Exception as e:
1561-
logger.warning(f"Error: {str(e)}")
1547+
logger.debug(f"Warning: {str(e)}")
15621548
pass
15631549
# Note: QWebEngineView cannot access http over 65535, so limit ports to 65534
15641550
ports = report_utils.find_unused_ports(1)
@@ -1688,7 +1674,7 @@ def launch_local_database_server(
16881674
)
16891675
return False
16901676
except Exception as e:
1691-
logger.warning(
1677+
logger.debug(
16921678
f"This can throw an error at the validate step but still be able to start a new server: {str(e)}"
16931679
)
16941680
pass
@@ -1762,7 +1748,7 @@ def launch_local_database_server(
17621748
# Note: this process only returns if the server is shutdown or there is an error
17631749
monitor_process = subprocess.Popen(command, **params) # nosec B78 B603
17641750
except Exception as e:
1765-
logger.warning(f"Error: {str(e)}")
1751+
logger.debug(f"Warning: {str(e)}")
17661752
if parent and has_qt:
17671753
QtWidgets.QApplication.restoreOverrideCursor()
17681754
msg = QtWidgets.QApplication.translate(
@@ -1824,7 +1810,7 @@ def launch_local_database_server(
18241810
)
18251811
except Exception as e:
18261812
# we will try again
1827-
logger.warning(
1813+
logger.debug(
18281814
f"This can throw an error at the validate steps if it's just starting, but still work: {str(e)}"
18291815
)
18301816
pass

0 commit comments

Comments
 (0)