diff --git a/log.py b/log.py index e3cf385..e5cac33 100644 --- a/log.py +++ b/log.py @@ -17,5 +17,13 @@ def log_server(log, type): -def chat_log(): - print("chat_log") \ No newline at end of file +def chat_log(log,type): + file_size = os.path.getsize('chat.log') + date = time.strftime("%d-%m-%Y %H:%M:%S", time.localtime(time.time())) + if file_size >= 1024*1024: + clear_log() + log = date + ' [' + type + '] ' + log + datei = open('chat.log', 'a') + datei.write('\n' + " " + log) + log = date + datei.close() diff --git a/run.sh b/run.sh index 6f07e41..a904c0a 100755 --- a/run.sh +++ b/run.sh @@ -9,5 +9,5 @@ if [ "$(id -u)" != "0" ]; then echo "Dieses Skript muss mit sudo ausgeführt werden!" exit 1 fi - +touch chat.log python3 main.py $@ \ No newline at end of file diff --git a/server.py b/server.py index b7eacfe..36eb27d 100644 --- a/server.py +++ b/server.py @@ -6,7 +6,7 @@ from flask import Flask, render_template, request, redirect from picker import picker as pick from database import dbcon, return_dbcon from mate import mate_logik, mws -from log import log_server +from log import log_server, chat_log #from picker import createChart # Funktion um den Server zu machen @@ -448,7 +448,7 @@ def server(): # Hier werden die Chat Nachrichten Verschickt @app.route("/get") def get(): - log_server("called /get with GET", "INFO") + chat_log("called /get with GET", "INFO") conn = sqlite3.connect("party.db") c = conn.cursor() c.execute("SELECT username, message, timestamp FROM messages")