Update Server.py

Author: guswl197

Server.py

@@ -77,18 +77,19 @@ def on_create_room(data):
     print(session)
 
     # Spring 로직 추가 => 방 생성
-    create_room_request(data, request.sid)
+    response = create_room_request(data, request.sid)
     print("방 생성됨!!!!!!!!!!!!!!!!!")
 
     emit("join-request")
 
     # elasticsearch
-    user_nickname = data["userNickname"]
-    room_id = data["roomName"]
-    date = datetime.datetime.now()
-    now = date.strftime('%m/%d/%y %H:%M:%S')
-    doc_create = {"des": "create room", "room_id": room_id, "user_nickname" : user_nickname, "@timestamp": utc_time()}
-    es.index(index=index_name, doc_type="log", body=doc_create)
+    users_in_room = response.json()
+
+    if len(users_in_room) == 1:
+        room_id = data["roomName"]
+        doc_create = {"des": "create room", "room_id": room_id, "@timestamp": utc_time()}
+        es.index(index=index_name, doc_type="log", body=doc_create)
+
 
 @socketio.on("join-room")
 def on_join_room(data):
@@ -114,12 +115,10 @@ def on_join_room(data):
     print("[{}] New member joined: {}<{}>".format(room_id, display_name, sid))
 
     ### elasticsearch
-    user_nickname = data["userNickname"]
-    date = datetime.datetime.now()
-    now = date.strftime('%m/%d/%y %H:%M:%S')
-    doc_join = {"des": "New member joined", "room_id": room_id, "sid": sid, "user_nickname" :user_nickname, "@timestamp": utc_time()}
-    es.index(index=index_name, doc_type="log", body=doc_join)
-    emit("user-connect", {"sid": sid, "name": display_name}, broadcast=True, include_self=False, room=room_id)
+    if len(users_in_room) > 1:
+        doc_join = {"des": "New member joined", "room_id": room_id, "sid": sid, "@timestamp": utc_time()}
+        es.index(index=index_name, doc_type="log", body=doc_join)
+        emit("user-connect", {"sid": sid, "name": display_name}, broadcast=True, include_self=False, room=room_id)
 
     message = {
         "sid": sid,
@@ -157,7 +156,7 @@ def on_join_room(data):
             print(key)
             print(users_in_room[key])
             if users_in_room[key] is display_name:
-                del usrlist[key]
+                del users_in_room[key]
         emit("user-list", {"list": usrlist, "my_id": sid})
 
     # print("\n users: ", users_in_room, "\n")
@@ -169,11 +168,10 @@ def on_disconnect():
     room_id = rooms_sid[sid]
     display_name = names_sid[sid]
 
-    ### elasticsearch
-    user_nickname = display_name
+    ### elk
     now = datetime.datetime.now()
     now = now.strftime('%m/%d/%y %H:%M:%S')
-    doc_disconnect = {"des": "user-disconnect", "room_id": room_id, "sid": sid, "user_nickname" :user_nickname, "@timestamp": utc_time()}
+    doc_disconnect = {"des": "user-disconnect", "room_id": room_id, "sid": sid, "@timestamp": utc_time()}
     es.index(index=index_name, doc_type="log", body=doc_disconnect)
 
     print("[{}] Member left: {}<{}>".format(room_id, display_name, sid))
@@ -219,17 +217,16 @@ def send_message(message):
     text = message["text"]
     room_id = message["room_id"]
 
-    ### elasticsearch
+    ### elk
 
     # date = datetime.datetime.now()
     # now = date.strftime('%m/%d/%y %H:%M:%S')
     # doc_chatting= {"des" : "chatting", "room_id" : room_id, "chatting message" : text,"@timestamp": utc_time()}
     # es.index(index=index_name, doc_type="log", body=doc_chatting)
-    
-    user_nickname = message["sender"]
+
     date = datetime.datetime.now()
     now = date.strftime('%m/%d/%y %H:%M:%S')
-    doc_chatting = {"des": "chatting", "room_id": room_id, "user_nickname" :user_nickname, "chatting message": text, "@timestamp": utc_time()}
+    doc_chatting = {"des": "chatting", "room_id": room_id, "chatting message": text, "@timestamp": utc_time()}
     es.index(index=index_name, doc_type="log", body=doc_chatting)
 
     data = {