Added logging
This commit is contained in:
@@ -4,11 +4,23 @@ import websocket
|
|||||||
import json
|
import json
|
||||||
import yaml
|
import yaml
|
||||||
import random
|
import random
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
|
|
||||||
__version__ = "2.2.0"
|
__version__ = "2.2.0"
|
||||||
versionstring='Taurix TellMe server v' + __version__
|
versionstring='Taurix TellMe server v' + __version__
|
||||||
|
|
||||||
|
log_dir = '/var/log/tellme'
|
||||||
|
os.makedirs(log_dir, exist_ok=True)
|
||||||
|
|
||||||
|
logging.basicConfig(
|
||||||
|
filename=f'{log_dir}/tellmesrv.log',
|
||||||
|
level=logging.INFO,
|
||||||
|
format='%(asctime)s - %(levelname)s - %(message)s'
|
||||||
|
)
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
# context = zmq.Context()
|
# context = zmq.Context()
|
||||||
@@ -41,25 +53,27 @@ def sendmessage(target, message):
|
|||||||
ws.close()
|
ws.close()
|
||||||
|
|
||||||
if response is not None:
|
if response is not None:
|
||||||
|
log.info("Sent message to SimpleX with %s" % (response))
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
|
log.error("Failed to send message to SimpleX with %s" % (response))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
@app.route("/webhook/<id>", methods=['POST'])
|
@app.route("/webhook/<id>", methods=['POST'])
|
||||||
def webhook_receiver(id):
|
def webhook_receiver(id):
|
||||||
print("Webhook id %s" % (id))
|
log.info("Webhook id %s" % (id))
|
||||||
data = request.json
|
data = request.json
|
||||||
|
|
||||||
# Process the data and perform actions based on the event
|
# Process the data and perform actions based on the event
|
||||||
print("Received webhook data:", data)
|
# log.info("Received webhook data: %s", data)
|
||||||
|
|
||||||
source = 'TellMe' # Support old TellMe client
|
source = 'TellMe' # Support old TellMe client
|
||||||
if data.get('AppName') is not None:
|
if data.get('AppName') is not None:
|
||||||
source = data.get('AppName')
|
source = data.get('AppName')
|
||||||
|
|
||||||
message = None
|
message = None
|
||||||
print("Message format is %s" % (source))
|
log.info("Message format is %s" % (source))
|
||||||
if source == 'TellMe':
|
if source == 'TellMe':
|
||||||
message = data.get('message')
|
message = data.get('message')
|
||||||
|
|
||||||
@@ -81,17 +95,17 @@ def webhook_receiver(id):
|
|||||||
target = value
|
target = value
|
||||||
|
|
||||||
if target is not None:
|
if target is not None:
|
||||||
print(target)
|
log.info(target)
|
||||||
if message is not None:
|
if message is not None:
|
||||||
sendmessage(target, message)
|
sendmessage(target, message)
|
||||||
else:
|
else:
|
||||||
print("No message, dropping")
|
log.error("No message, dropping")
|
||||||
else:
|
else:
|
||||||
print("No target found, dropping message")
|
log.error("No target found, dropping message")
|
||||||
|
|
||||||
return jsonify({'message': 'Webhook received successfully'}), 200
|
return jsonify({'message': 'Webhook received successfully'}), 200
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
print("Started %s" % (versionstring))
|
log.info("Started %s" % (versionstring))
|
||||||
app.run()
|
app.run()
|
||||||
|
|||||||
Reference in New Issue
Block a user