Skip to content

Commit 4c8b835

Browse files
committed
#20 refactor logging methods to use common _log function
1 parent 2d58a66 commit 4c8b835

File tree

1 file changed

+27
-40
lines changed

1 file changed

+27
-40
lines changed

src/iop/_common.py

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -203,87 +203,74 @@ def _get_properties(cls):
203203
except:
204204
pass
205205
return ret
206-
207-
def log_info(self, message):
208-
""" Write a log entry of type "info". Log entries can be viewed in the management portal.
209-
210-
Parameters:
211-
message: a string that is written to the log.
206+
207+
def _log(self) -> (str,str):
208+
""" Get the class name and method name of the calling method.
209+
Returns a tuple of the class name and the method name.
212210
"""
213-
214211
current_class = self.__class__.__name__
215212
current_method = None
216213
try:
217214
frame = traceback.extract_stack()[-2]
218215
current_method = frame.name
219216
except:
220217
pass
218+
return current_class, current_method
219+
220+
def trace(self, message):
221+
""" Write a log entry of type "trace". Log entries can be viewed in the management portal.
222+
223+
Parameters:
224+
message: a string that is written to the log.
225+
"""
226+
current_class, current_method = self._log()
227+
iris.cls("Ens.Util.Log").LogTrace(current_class, current_method, message,1)
228+
229+
def log_info(self, message):
230+
""" Write a log entry of type "info". Log entries can be viewed in the management portal.
231+
232+
Parameters:
233+
message: a string that is written to the log.
234+
"""
235+
236+
current_class, current_method = self._log()
221237
iris.cls("Ens.Util.Log").LogInfo(current_class, current_method, message)
222-
return
223238

224239
def log_alert(self, message):
225240
""" Write a log entry of type "alert". Log entries can be viewed in the management portal.
226241
227242
Parameters:
228243
message: a string that is written to the log.
229244
"""
230-
current_class = self.__class__.__name__
231-
current_method = None
232-
try:
233-
frame = traceback.extract_stack()[-2]
234-
current_method = frame.name
235-
except:
236-
pass
245+
current_class, current_method = self._log()
237246
iris.cls("Ens.Util.Log").LogAlert(current_class, current_method, message)
238-
return
239247

240248
def log_warning(self, message):
241249
""" Write a log entry of type "warning". Log entries can be viewed in the management portal.
242250
243251
Parameters:
244252
message: a string that is written to the log.
245253
"""
246-
current_class = self.__class__.__name__
247-
current_method = None
248-
try:
249-
frame = traceback.extract_stack()[-2]
250-
current_method = frame.name
251-
except:
252-
pass
254+
current_class, current_method = self._log()
253255
iris.cls("Ens.Util.Log").LogWarning(current_class, current_method, message)
254-
return
255256

256257
def log_error(self, message):
257258
""" Write a log entry of type "error". Log entries can be viewed in the management portal.
258259
259260
Parameters:
260261
message: a string that is written to the log.
261262
"""
262-
current_class = self.__class__.__name__
263-
current_method = None
264-
try:
265-
frame = traceback.extract_stack()[-2]
266-
current_method = frame.name
267-
except:
268-
pass
263+
current_class, current_method = self._log()
269264
iris.cls("Ens.Util.Log").LogError(current_class, current_method, message)
270-
return
271265

272266
def log_assert(self, message):
273267
""" Write a log entry of type "assert". Log entries can be viewed in the management portal.
274268
275269
Parameters:
276270
message: a string that is written to the log.
277271
"""
278-
current_class = self.__class__.__name__
279-
current_method = None
280-
try:
281-
frame = traceback.extract_stack()[-2]
282-
current_method = frame.name
283-
except:
284-
pass
272+
current_class, current_method = self._log()
285273
iris.cls("Ens.Util.Log").LogAssert(current_class, current_method, message)
286-
return
287274

288275
def LOGINFO(self, message):
289276
""" DECAPRETED : use log_info

0 commit comments

Comments
 (0)