Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Fix webhook not having app context

Browse source
This commit is contained in:
redfast00 2019-09-11 22:38:01 +02:00
parent 5e2d5e659c
commit 5b2f6de323
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config.example.py
View file

@ -6,7 +6,7 @@ class Configuration(object):
SQLALCHEMY_TRACK_MODIFICATIONS = False SQLALCHEMY_TRACK_MODIFICATIONS = False
DEBUG = True DEBUG = True
SECRET_KEY = "<change>" SECRET_KEY = "<change>"
SLACK_WEBHOOK = "<add url>" SLACK_WEBHOOK = None
LOGFILE = "haldis.log" LOGFILE = "haldis.log"
ZEUS_KEY = "tomtest" ZEUS_KEY = "tomtest"
ZEUS_SECRET = "blargh" ZEUS_SECRET = "blargh"

15
app/notification.py
View file

@ -22,30 +22,29 @@ def post_order_to_webhook(order_item) -> None:
remaining_minutes(order_item.stoptime), remaining_minutes(order_item.stoptime),
url_for("order_bp.order", id=order_item.id, _external=True), url_for("order_bp.order", id=order_item.id, _external=True),
) )
webhookthread = WebhookSenderThread(message) webhookthread = WebhookSenderThread(message, app.config["SLACK_WEBHOOK"])
webhookthread.start() webhookthread.start()
class WebhookSenderThread(Thread): class WebhookSenderThread(Thread):
def __init__(self, message: str) -> None: def __init__(self, message: str, url: str) -> None:
super(WebhookSenderThread, self).__init__() super(WebhookSenderThread, self).__init__()
self.message = message self.message = message
self.url = url
def run(self) -> None: def run(self) -> None:
self.slack_webhook() self.slack_webhook()
def slack_webhook(self) -> None: def slack_webhook(self) -> None:
js = json.dumps({"text": self.message}) if self.url:
url = app.config["SLACK_WEBHOOK"] requests.post(url, json={"text": self.message})
if len(url) > 0:
requests.post(url, data=js)
else: else:
app.logger.info(str(js)) print(self.message)
def remaining_minutes(value) -> str: def remaining_minutes(value) -> str:
delta = value - datetime.now() delta = value - datetime.now()
if delta.total_seconds() < 0: if delta.total_seconds() < 0:
return "0" return "0"
minutes, _ = divmod(delta.total_seconds(), 60) minutes = delta.total_seconds() // 60
return "%02d" % minutes return "%02d" % minutes