Skip to content

Commit

Permalink
Updated error log format
Browse files Browse the repository at this point in the history
  • Loading branch information
lhgomes committed May 8, 2023
1 parent c398a7a commit 32377ad
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 25 deletions.
2 changes: 0 additions & 2 deletions pack.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
mkdir -p build/python/lib/python3.7/site-packages
mkdir -p build/python/lib/python3.8/site-packages
mkdir -p build/python/lib/python3.9/site-packages
mkdir -p build/python/lib/python3.10/site-packages
cp -R phhelper build/python/lib/python3.7/site-packages
cp -R phhelper build/python/lib/python3.8/site-packages
cp -R phhelper build/python/lib/python3.9/site-packages
cp -R phhelper build/python/lib/python3.10/site-packages
Expand Down
43 changes: 22 additions & 21 deletions phhelper/aws_lambda_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@ def __get_log_level(env_name='LOG_LEVEL', default_level='ERROR'):

return log_level

def __log_error(error):
logging.error({
"type": type(error).__name__,
"message": error,
"at": traceback.format_exception(error)
})

def __setup_log(context):
aws_lambda_logging.setup(level=log_level, boto_level=boto_level,
function_arn=context.invoked_function_arn,
Expand Down Expand Up @@ -56,8 +63,7 @@ def __default_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error
finally:
logging.debug(result)
Expand All @@ -75,7 +81,7 @@ def __multi_record_process(f, thread_num, record, context):

return True
except Exception as error:
logging.error('Error with record processing')
__log_error(error)
raise error

def __thread_records_handler(f, event, context):
Expand All @@ -100,8 +106,7 @@ def __thread_records_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error

return True
Expand All @@ -115,8 +120,7 @@ def __batch_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error
finally:
logging.debug(result)
Expand All @@ -132,27 +136,27 @@ def __records_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error

return True

def __partial_batch_records_handler(f, event, context):
batch_item_failures = []
batch_response = {}

for record in event['Records']:
try:
f(record, context)
except Exception as error:
batch_item_failures.append({"itemIdentifier": record['messageId']})
__log_error(error)

logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())

batch_response["batchItemFailures"] = batch_item_failures
return batch_response
if len(batch_item_failures) > 0:
logging.critical(f'Batch item failures: {batch_item_failures}')
return { 'batchItemFailures': batch_item_failures }
else:
logging.info(f'Processed records: {len(event["Records"])}')
return None

def __cognito_handler(f, event, context):
result = None
Expand All @@ -165,8 +169,7 @@ def __cognito_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error
finally:
logging.debug(result)
Expand All @@ -184,8 +187,7 @@ def __events_handler(f, event, context):
logging.info('lambda_handler assert: %s' % (error))
raise error
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
raise error
finally:
logging.debug(result)
Expand All @@ -209,8 +211,7 @@ def __apigateway_handler(f, event, context):
}
}
except Exception as error:
logging.error('lambda_handler error: %s' % (error))
logging.error('lambda_handler trace: %s' % traceback.format_exc())
__log_error(error)
result = {
'statusCode': 500,
'body': json.dumps({'message': str(error)}),
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setuptools.setup(
name='phhelper',
version='0.9.24',
version='0.9.25',
author='Luiz Henrique Gomes',
author_email="lhgnet@gmail.com",
description='Python Handler Helper for Lambda',
Expand All @@ -19,6 +19,6 @@
"License :: OSI Approved :: MIT License",
"Operating System :: OS Independent",
],
python_requires='>=3.7',
python_requires='>=3.8',
license='MIT',
)

0 comments on commit 32377ad

Please sign in to comment.