Przeglądaj źródła

Adding ip argument to server to specify IP, adding TEST mode to test server

Andrej Studen 3 lat temu
rodzic
commit
19bd704ea0
1 zmienionych plików z 12 dodań i 6 usunięć
  1. 12 6
      websocketServer.py

+ 12 - 6
websocketServer.py

@@ -29,7 +29,7 @@ async def hello(websocket):
     print(f"<<< FROM: {host}")
     print(f"<<< {message}")
 
-    greeting = f"Hello {message}!"
+    #greeting = f"Hello {message}!"
     
     key=0
     try:
@@ -42,18 +42,24 @@ async def hello(websocket):
         print("Exit signal")
         websocket.ws_server.close()
         return
-    
+   
+    if parts[0]=="TEST":
+        print('Test')
+        return
+
     run(message)
     
     
     #await websocket.send(greeting)
     #don't send anything, just log
-    print(f">>> {greeting}")
+    print(">>>[{}] Done".format(message))
 
-async def main():
+async def main(ip):
     origins=["merlin","labkey-public","onko-nix",None]
     #server="vangogh.fmf.uni-lj.si"
-    serverIP="193.2.68.227"
+    #serverIP="193.2.68.227"
+    #serve IP as argument
+    serverIP=ip
     print(f"Starting server at {serverIP}")
     async with websockets.serve(hello, serverIP, 8765,origins=origins) as server:
         #await asyncio.Future()  # run forever
@@ -83,4 +89,4 @@ def run(message):
 	
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main(sys.argv[1]))