Skip to content

Commit f9cda15

Browse files
committed
finalize edge cases
1 parent 3a6ed8a commit f9cda15

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

delta_backend/src/ConversionChecker.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,17 +234,15 @@ def _convertToDose(self, expressionRule, fieldName, fieldValue, summarise, repor
234234
return fieldValue
235235
return ""
236236

237-
# Change to Lookup
237+
# Change to Lookup (loads expected data as is but if empty use lookup extraction to populate value)
238238
def _convertToLookUp(self, expressionRule, fieldName, fieldValue, summarise, report_unexpected_exception):
239+
if isinstance(fieldValue, str) and any(char.isalpha() for char in fieldValue) and not fieldValue.isdigit():
240+
return fieldValue
239241
try:
240-
if fieldValue != "":
241-
return fieldValue
242-
try:
243242
lookUpValue = self.dataParser.getKeyValue(expressionRule)
244243
IdentifiedLookup = self.dataLookUp.findLookUp(lookUpValue[0])
245244
return IdentifiedLookup
246-
except:
247-
return ""
245+
248246
except Exception as e:
249247
if report_unexpected_exception:
250248
message = ExceptionMessages.MESSAGES[ExceptionMessages.UNEXPECTED_EXCEPTION] % (e.__class__.__name__, e)

delta_backend/src/log_firehose.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ def __init__(
1919
self.delivery_stream_name = stream_name
2020

2121
def send_log(self, log_message):
22-
# if not self.delivery_stream_name:
23-
# logger.warning("No SPLUNK_FIREHOSE_NAME set — skipping Firehose log.")
24-
# return
25-
2622
log_to_splunk = log_message
2723
logger.info(f"Log sent to Firehose for save: {log_to_splunk}")
2824
encoded_log_data = json.dumps(log_to_splunk).encode("utf-8")

0 commit comments

Comments
 (0)