testing my change

Author: HEEJAERO

Server.py

@@ -1,7 +1,7 @@
 from flask import Flask, request, session
 from flask_socketio import SocketIO, emit, join_room
-# from elasticsearch import Elasticsearch
-# from elasticsearch import helpers
+from elasticsearch import Elasticsearch
+from elasticsearch import helpers
 import datetime
 import redis
 import requests
@@ -43,18 +43,19 @@ class Settings(BaseSettings):
 
 
 ### elk, kibana
-# es = Elasticsearch(f'{ES_IP}:{ES_PORT}') ## 변경
-# es.info()
+es = Elasticsearch(f'{ES_IP}:{ES_PORT}') ## 변경
+es.info()
 
-# def utc_time():
-#     return datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
 
-# def make_index(es, index_name):
-#     if es.indices.exists(index=index_name):
-#         es.indices.delete(index=index_name)
-#         es.indices.create(index=index_name)
+def utc_time():  
+    return datetime.datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z'
 
-# index_name= 'webrtc_room'
+def make_index(es, index_name):
+    if es.indices.exists(index=index_name):
+        es.indices.delete(index=index_name)
+        es.indices.create(index=index_name)
+
+index_name= 'webrtc_room'
 
 @app.route('/')
 def hello():
@@ -79,12 +80,12 @@ def on_create_room(data):
     emit("join-request")
 
 
-# elk
-# room_id = data["room_id"]
-# date = datetime.datetime.now()
-# now = date.strftime('%m/%d/%y %H:%M:%S')
-# doc_create= {"des":"create room", "room_id":room_id, "@timestamp": utc_time()}
-# es.index(index=index_name, doc_type="log", body=doc_create)
+    # elk
+    room_id = data["room_id"]
+    date = datetime.datetime.now()
+    now = date.strftime('%m/%d/%y %H:%M:%S')
+    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")
@@ -111,10 +112,10 @@ def on_join_room(data):
     print("[{}] New member joined: {}<{}>".format(room_id, display_name, sid))
 
     ### elk
-    # 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, "@timestamp": utc_time()}
-    # es.index(index=index_name, doc_type="log", body=doc_join)
+    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, "@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 = {
@@ -166,16 +167,16 @@ def on_disconnect():
     display_name = names_sid[sid]
 
     ### 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, "@timestamp": utc_time()}
-    # es.index(index=index_name, doc_type="log", body=doc_disconnect)
+    now = datetime.datetime.now()
+    now = now.strftime('%m/%d/%y %H:%M:%S')
+    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))
     message = {
         "sid": sid,
         "name": display_name,
-        'type': "join"
+        'type': "disconnect"
     }
     emit("chatting", message, broadcast=True, include_self=True, room=room_id)
 
@@ -215,16 +216,26 @@ def send_message(message):
     room_id = message["room_id"]
 
     ### 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)
 
+
+    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)
+    
+
     data = {
         "text": text,
         "room_id": room_id,
         "sender": sender,
-        "type": "normal"
+        "type": "normal",
+        "direct": False, # react에서 dm인지 아닌지 확인할 수 있는 필드
+        "target" : "self"
     }
 
     # front로부터 받은 data에 direct라는 필드가 있고 false 값이라면 브로드캐스팅을 하고
@@ -233,7 +244,11 @@ def send_message(message):
         if message["direct"] == False:
             emit("chatting", data, broadcast=True, include_self=True, room=room_id)
         else:
+            data["direct"] = True
+            emit("chatting", data, to=request.sid)
+            data["target"] = "other"
             emit("chatting", data, to=message["dest"])
+
     # broadcast to others in the room
     # emit("chatting", data, room=room_id)
 
@@ -281,4 +296,4 @@ def exit_room(socketID):
                  host="0.0.0.0",
                  port=5000
                  )
-    # make_index(es, index_name)
+    make_index(es, index_name)

test

@@ -0,0 +1 @@
+test