Tucan444/Mabasej_Team
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update server

Browse Source
This commit is contained in:
Untriex Programming 2021-04-22 20:43:57 +02:00
parent 2156570723
commit e514054c6b
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/log.txt
View File

@ -156,4 +156,8 @@
2021-04-14 14:09:58.696666 -> Warning: Address(host='192.168.1.99', port=58182) created new sensor. 2021-04-14 14:09:58.696666 -> Warning: Address(host='192.168.1.99', port=58182) created new sensor.
SENSOR: name='sensor1' value='test' SENSOR: name='sensor1' value='test'
2021-04-14 14:10:06.190377 -> Warning: Address(host='192.168.1.99', port=58192) created new sensor. 2021-04-14 14:10:06.190377 -> Warning: Address(host='192.168.1.99', port=58192) created new sensor.
SENSOR: name='sensor2' value='123456789' SENSOR: name='sensor2' value='123456789'
2021-04-22 10:15:53.540044 -> Warning: Address(host='192.168.1.99', port=43642) created new sensor.
SENSOR: name='test1' value='juhuu'
2021-04-22 10:16:02.865022 -> Warning: Address(host='192.168.1.99', port=43644) created new sensor.
SENSOR: name='test2' value='eeeh'

14
server/main.py
View File

@ -75,6 +75,11 @@ class Sensor(BaseModel):
value: str value: str
class Message(BaseModel):
m_sender: str
message: str
@app.get("/") @app.get("/")
def read_root(): def read_root():
return "wikispot" return "wikispot"
@ -265,9 +270,12 @@ def register():
@app.post("/messages/post") @app.post("/messages/post")
def get_messages(m_sender: str = None, message: str = None): def post_messages(data: Message):
if m_sender and message: log.debug(f"Message was posted. Sender: {data.m_sender}\n MESSAGE: {data.message}")
messages.append({"sender": m_sender, "message": message, "timestamp": time.time()}) if len(messages) >= settings["max_mess"]:
del messages[:len(messages) - settings["max_mess"]]
if data.m_sender and data.message:
messages.append({"sender": data.m_sender, "message": data.message, "timestamp": time.time()})
return "successful" return "successful"
else: else:
return "Empty message/sender" return "Empty message/sender"

1
server/settings.json
View File

@ -6,6 +6,7 @@
"time_to_heartbeat_offline": 25, "time_to_heartbeat_offline": 25,
"save_table": false, "save_table": false,
"time_to_save": 60, "time_to_save": 60,
"max_mess": 20,
"log": { "log": {
"save_error": true, "save_error": true,
"print_error": true, "print_error": true,

9
server/test.py
View File

@ -0,0 +1,9 @@
import requests
import time
send_n = 100
wait_t = 0.5
for x in range(send_n):
r = requests.post("http://192.168.1.99:8000/messages/post", json={"m_sender": "server", "message": str(x)})
print(f"Sent message {x+1}/{send_n}\nResponse: {r.text}")
time.sleep(wait_t)