From 80d80657d6f729641a60dabe116ec80363dc633b Mon Sep 17 00:00:00 2001 From: Son Date: Sat, 6 Mar 2021 16:09:27 +0100 Subject: [PATCH] remove cloudwatch params --- app/config.py | 6 ------ app/log.py | 36 ------------------------------------ example.env | 4 ---- tests/test.env | 6 ------ 4 files changed, 52 deletions(-) diff --git a/app/config.py b/app/config.py index b4dd2aa7..d7ffa863 100644 --- a/app/config.py +++ b/app/config.py @@ -183,12 +183,6 @@ BUCKET = os.environ.get("BUCKET") AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID") AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY") -CLOUDWATCH_LOG_GROUP = CLOUDWATCH_LOG_STREAM = "" -ENABLE_CLOUDWATCH = "ENABLE_CLOUDWATCH" in os.environ -if ENABLE_CLOUDWATCH: - CLOUDWATCH_LOG_GROUP = os.environ["CLOUDWATCH_LOG_GROUP"] - CLOUDWATCH_LOG_STREAM = os.environ["CLOUDWATCH_LOG_STREAM"] - # Paddle try: PADDLE_VENDOR_ID = int(os.environ["PADDLE_VENDOR_ID"]) diff --git a/app/log.py b/app/log.py index af80df1a..00724e70 100644 --- a/app/log.py +++ b/app/log.py @@ -2,17 +2,9 @@ import logging import sys import time -import boto3 import coloredlogs -import watchtower from app.config import ( - AWS_ACCESS_KEY_ID, - AWS_SECRET_ACCESS_KEY, - AWS_REGION, - CLOUDWATCH_LOG_GROUP, - ENABLE_CLOUDWATCH, - CLOUDWATCH_LOG_STREAM, COLOR_LOG, ) @@ -28,25 +20,6 @@ def _get_console_handler(): return console_handler -def _get_watchtower_handler(): - session = boto3.Session( - aws_access_key_id=AWS_ACCESS_KEY_ID, - aws_secret_access_key=AWS_SECRET_ACCESS_KEY, - region_name=AWS_REGION, - ) - - handler = watchtower.CloudWatchLogHandler( - log_group=CLOUDWATCH_LOG_GROUP, - stream_name=CLOUDWATCH_LOG_STREAM, - send_interval=5, # every 5 sec - boto3_session=session, - ) - - handler.setFormatter(_log_formatter) - - return handler - - def _get_logger(name): logger = logging.getLogger(name) @@ -55,15 +28,6 @@ def _get_logger(name): # leave the handlers level at NOTSET so the level checking is only handled by the logger logger.addHandler(_get_console_handler()) - if ENABLE_CLOUDWATCH: - print( - "enable cloudwatch, log group", - CLOUDWATCH_LOG_GROUP, - "; log stream:", - CLOUDWATCH_LOG_STREAM, - ) - logger.addHandler(_get_watchtower_handler()) - # no propagation to avoid propagating to root logger logger.propagate = False diff --git a/example.env b/example.env index 1ffb8c85..f7a8365c 100644 --- a/example.env +++ b/example.env @@ -94,10 +94,6 @@ AWS_ACCESS_KEY_ID=to_fill AWS_SECRET_ACCESS_KEY=to_fill AWS_REGION=to_fill -# Cloudwatch -# ENABLE_CLOUDWATCH=true -# CLOUDWATCH_LOG_GROUP=local -# CLOUDWATCH_LOG_STREAM=local # <<< END AWS >>> # Paddle diff --git a/tests/test.env b/tests/test.env index 96afe6aa..4e29de24 100644 --- a/tests/test.env +++ b/tests/test.env @@ -27,12 +27,6 @@ BUCKET=to_fill AWS_ACCESS_KEY_ID=to_fill AWS_SECRET_ACCESS_KEY=to_fill -# Cloudwatch -# ENABLE_CLOUDWATCH=true -CLOUDWATCH_LOG_GROUP=local -CLOUDWATCH_LOG_STREAM=local - - # Paddle PADDLE_VENDOR_ID = 1 PADDLE_MONTHLY_PRODUCT_ID = 2