use logging instead of prints;

This commit is contained in:
Marco Zeisler 2021-05-04 20:41:03 +02:00
parent 930e23a01e
commit ed9356b7f9
5 changed files with 22 additions and 30 deletions

View File

@ -1,7 +1,10 @@
import sys import sys
import logging
from django.apps import AppConfig from django.apps import AppConfig
logger = logging.getLogger(__name__)
class AppBeConfig(AppConfig): class AppBeConfig(AppConfig):
name = 'app_be' name = 'app_be'
@ -12,4 +15,4 @@ class AppBeConfig(AppConfig):
from app_be.views.twitter_bot import twitter_bot from app_be.views.twitter_bot import twitter_bot
twitter_bot1 = twitter_bot() twitter_bot1 = twitter_bot()
twitter_bot1.start() twitter_bot1.start()
print("bot started") logger.debug("bot started")

View File

@ -182,26 +182,11 @@ LOGGING = {
'level': 'DEBUG', 'level': 'DEBUG',
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'verbose' 'formatter': 'verbose'
}
}, },
'logfile': {
'level': 'DEBUG',
'class': 'logging.FileHandler',
'filename': BASE_DIR + "/../logfile",
'formatter': 'verbose'
},
},
'loggers': { 'loggers': {
'rdg': { 'app_be': {
'handlers': ['console', 'logfile'], 'handlers': ['console'],
'level': 'DEBUG',
},
'rdg_rest': {
'handlers': ['console', 'logfile'],
'level': 'DEBUG',
},
'rdg_angular': {
'handlers': ['console', 'logfile'],
'level': 'DEBUG', 'level': 'DEBUG',
}, },
}, },

View File

@ -19,7 +19,6 @@ def authorize(request):
logger.debug('Validating request: {}'.format(request)) logger.debug('Validating request: {}'.format(request))
if 'Authorization' not in request.headers: if 'Authorization' not in request.headers:
print(f"Authorization header missing")
logger.error(f"Authorization header missing") logger.error(f"Authorization header missing")
return None return None
@ -38,11 +37,9 @@ def authorize(request):
if 'sub' in payload: if 'sub' in payload:
return payload['sub'] return payload['sub']
except PyJwtException as e: except PyJwtException as e:
print(f"Exception caught. Error: {e}")
logger.error(f"Exception caught. Error: {e}") logger.error(f"Exception caught. Error: {e}")
return None return None
except UnicodeDecodeError as e2: except UnicodeDecodeError as e2:
print(f"Exception caught. Error: {e2}")
logger.error(f"Exception caught. Error: {e2}") logger.error(f"Exception caught. Error: {e2}")
return None return None
return None return None

View File

@ -1,9 +1,13 @@
import logging
from datetime import datetime from datetime import datetime
import twitter import twitter
import os import os
from dotenv import load_dotenv from dotenv import load_dotenv
logger = logging.getLogger(__name__)
load_dotenv() load_dotenv()
api = twitter.Api(consumer_key=os.getenv('TWITTER_API_KEY'), api = twitter.Api(consumer_key=os.getenv('TWITTER_API_KEY'),
@ -16,18 +20,18 @@ class twitter_api:
@staticmethod @staticmethod
def check_credentials(): def check_credentials():
print(api.VerifyCredentials()) logger.debug("{}".format(api.VerifyCredentials()))
@staticmethod @staticmethod
def get_last_six_tweets(): def get_last_six_tweets():
last_six = api.GetUserTimeline(screen_name='waecmg4',count=6,exclude_replies=True,include_rts=False) last_six = api.GetUserTimeline(screen_name='waecmg4',count=6,exclude_replies=True,include_rts=False)
print(type(last_six)) logger.debug("type(last_six): {}".format(type(last_six)))
response = [] response = []
for tweet in last_six: for tweet in last_six:
print(tweet) logger.debug("Tweet: {}".format(tweet))
parsed_date = datetime.strptime(tweet.created_at,"%a %b %d %H:%M:%S +0000 %Y") parsed_date = datetime.strptime(tweet.created_at,"%a %b %d %H:%M:%S +0000 %Y")
tweet_date = datetime.strftime(parsed_date,"%d.%m.%y %H:%M") tweet_date = datetime.strftime(parsed_date,"%d.%m.%y %H:%M")
@ -50,7 +54,7 @@ class twitter_api:
response = [] response = []
for tweet in last_six: for tweet in last_six:
print(tweet) logger.debug("Tweet: {}".format(tweet))
parsed_date = datetime.strptime(tweet.created_at, "%a %b %d %H:%M:%S +0000 %Y") parsed_date = datetime.strptime(tweet.created_at, "%a %b %d %H:%M:%S +0000 %Y")
tweet_date = datetime.strftime(parsed_date, "%d.%m.%y %H:%M") tweet_date = datetime.strftime(parsed_date, "%d.%m.%y %H:%M")

View File

@ -1,3 +1,4 @@
import logging
import threading import threading
from datetime import datetime from datetime import datetime
import time import time
@ -7,6 +8,8 @@ from app_be.views.twitter_api import twitter_api
import feedparser import feedparser
from dateutil import parser from dateutil import parser
logger = logging.getLogger(__name__)
class twitter_bot(threading.Thread): class twitter_bot(threading.Thread):
@ -19,7 +22,7 @@ class twitter_bot(threading.Thread):
while True: while True:
print("Looking for new results in active feeds") logger.debug("Looking for new results in active feeds")
feed_set = Feed.objects.filter(active=True) feed_set = Feed.objects.filter(active=True)
for feed in feed_set: for feed in feed_set:
@ -42,7 +45,7 @@ class twitter_bot(threading.Thread):
if search_keywords(keywords, current, feed.match_all_keywords): if search_keywords(keywords, current, feed.match_all_keywords):
print("Keyword found") logger.debug("Keyword found")
# preparing tweet # preparing tweet
new_tweet = Tweet() new_tweet = Tweet()
@ -60,8 +63,8 @@ class twitter_bot(threading.Thread):
# if tweet not in db yet # if tweet not in db yet
if not Tweet.objects.filter(text=new_tweet.text): if not Tweet.objects.filter(text=new_tweet.text):
# call twitter api to post tweet and store to db # call twitter api to post tweet and store to db
print("Posting update on Twitter") logger.debug("Posting update on Twitter")
print(new_tweet) logger.debug("new_tweet: {}".format(new_tweet))
twitter_api.post_update(new_tweet.text, new_tweet.url) twitter_api.post_update(new_tweet.text, new_tweet.url)
new_tweet.save() new_tweet.save()