diff --git a/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java b/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java index 2d24062..0aea0a4 100644 --- a/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java +++ b/src/main/java/info/istlab/ServerTester/ServerPanel4WS.java @@ -56,13 +56,8 @@ stopButton.addActionListener(e -> { if (server.isClosed()) { server = new SimpleWebSocketServer(server.getExpectedPort(), server.getExpectedAddress()); - server.start(); } else { - try { - server.stop(); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } + server.stop(); } repaint(); host.pack(); @@ -71,11 +66,7 @@ delButton = new JButton("Delete"); delButton.setEnabled(false); delButton.addActionListener(e -> { - try { - server.stop(); - } catch (InterruptedException e1) { - e1.printStackTrace(); - } + server.stop(); Host.mainhost.mainPanel.remove(this); Host.mainhost.pack(); }); diff --git a/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java b/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java index af812d0..e8c2bb4 100644 --- a/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java +++ b/src/main/java/info/istlab/ServerTester/SimpleWebSocketServer.java @@ -37,26 +37,25 @@ @Override public void onOpen(WebSocket conn, ClientHandshake handshake) { - System.out.println("New connection from " + conn.getRemoteSocketAddress()); + System.out.println("[SWS] New connection from " + conn.getRemoteSocketAddress()); conn.send("Welcome to the server! " + conn.getRemoteSocketAddress()); // クライアントにメッセージを送信 } @Override public void onClose(WebSocket conn, int code, String reason, boolean remote) { - System.out.println("Closed connection to " + conn.getRemoteSocketAddress()); - isClosed = true; + System.out.println("[SWS] Closed client connection to " + conn.getRemoteSocketAddress()); } @Override public void onMessage(WebSocket conn, String message) { - System.out.println("Received: " + message); + System.out.println("[SWS] Received: " + message); // conn.send("Echo: " + message); // 受け取ったメッセージをそのまま返す broadcastMessage(message); // すべてのクライアントにメッセージを送信 } @Override public void onError(WebSocket conn, Exception ex) { - System.out.println("Error: " + ex.getMessage()); + System.out.println("[SWS] Error: " + ex.getMessage()); if (ex.getMessage().startsWith("Address already in use")){ bindFailed = true; isClosed = true; @@ -94,4 +93,13 @@ public int getExpectedPort() { return expectedPort; } + + public void stop(){ + try { + super.stop(1000, "SWS stopped"); + } catch (InterruptedException e) { + e.printStackTrace(); + } + isClosed = true; + } } diff --git a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java index b127278..b9caf59 100644 --- a/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java +++ b/src/main/java/info/istlab/ServerTester/ThreadEchoServer.java @@ -31,7 +31,7 @@ while (serverSocket.isBound()) { try { Socket socket = serverSocket.accept(); - System.out.println("---\nConnection Requst from: " + (socket.getInetAddress())); + System.out.println("[TES] ---\nConnection Requst from: " + (socket.getInetAddress())); new RequestHandler4TES(socket); } catch (IOException e) { thread = null; @@ -57,20 +57,20 @@ PrintStream os; BufferedReader br; String line; - System.out.println("accept"); + System.out.println("[TES] accept"); try { br = new BufferedReader(new InputStreamReader(sock.getInputStream())); os = new PrintStream(sock.getOutputStream()); // クライアントからのメッセージを待ち、受け取ったメッセージをそのまま返す while ((line = br.readLine()) != null) { - System.out.println("(Server received) " + line); + System.out.println("[TES] (Server received) " + line); os.println(line); } } catch (IOException e) { // os.close(); System.out.println(e); } finally { - System.out.println("disconnected " + sock.toString()); + System.out.println("[TES] disconnected " + sock.toString()); } } } \ No newline at end of file diff --git a/src/main/java/info/istlab/ServerTester/ThreadTimeServer.java b/src/main/java/info/istlab/ServerTester/ThreadTimeServer.java index d483561..c805845 100644 --- a/src/main/java/info/istlab/ServerTester/ThreadTimeServer.java +++ b/src/main/java/info/istlab/ServerTester/ThreadTimeServer.java @@ -30,7 +30,7 @@ while (serverSocket.isBound()) { try { Socket socket = serverSocket.accept(); - System.out.println("---\nConnection Requst from: " + (socket.getInetAddress())); + System.out.println("[TTS] ---\nConnection Requst from: " + (socket.getInetAddress())); new RequestHandler4TTS(socket); } catch (IOException e) { thread = null; @@ -57,28 +57,28 @@ String outstr; // 出力データを格納する文字列 Date d; // 日付時刻処理用オブジェクト - System.out.println("(ThreadTimeServer) accepted (client has connected)"); + System.out.println("[TTS] accepted (client has connected)"); System.out.println(sock.getRemoteSocketAddress().toString()); try { os = new PrintStream(sock.getOutputStream()); // 出力用データの作成 d = new Date(); outstr = "\n" + "Hello, this is ThreadTimeServer.\n" + d.toString() + "\n"; - System.out.println("(サーバ→クライアント) " + outstr); + System.out.println("[TTS] (サーバ→クライアント) " + outstr); // データの出力(1回目) os.println(outstr); Thread.sleep(3000); // 3秒まつ outstr = new Date().toString(); os.println(outstr); // データの出力(2回目) - System.out.println("(サーバ→クライアント) " + outstr); + System.out.println("[TTS] (サーバ→クライアント) " + outstr); Thread.sleep(3000); // 3秒まつ outstr = "Thank you."; os.println(outstr); - System.out.println("(サーバ→クライアント) " + outstr); + System.out.println("[TTS] (サーバ→クライアント) " + outstr); os.close(); // 接続終了 sock.close(); - System.out.println("(ThreadTimeServer) クライアントからの接続を閉じました"); + System.out.println("[TTS] クライアントからの接続を閉じました"); } catch (IOException e) { e.printStackTrace(); } catch (InterruptedException e) { diff --git a/src/main/java/info/istlab/ServerTester/WebServer.java b/src/main/java/info/istlab/ServerTester/WebServer.java index 27065b8..127e6dd 100644 --- a/src/main/java/info/istlab/ServerTester/WebServer.java +++ b/src/main/java/info/istlab/ServerTester/WebServer.java @@ -70,7 +70,7 @@ while (serverSocket.isBound()) { try { Socket socket = serverSocket.accept(); - System.out.println("---\nConnection Requst from: " + (socket.getInetAddress())); + // System.out.println("---\nConnection Requst from: " + (socket.getInetAddress())); new RequestHandler(socket, rootdir); } catch (IOException e) { thread = null; @@ -113,7 +113,7 @@ } void process() throws IOException { - System.out.println("---\nConnection Requst from: " + (sock.getInetAddress())); + System.out.println("---[Web start]\n[Web] Connection Requst from: " + (sock.getInetAddress())); // 読み書き用オブジェクトの生成 in = new BufferedReader(new InputStreamReader(sock.getInputStream())); dostr = new DataOutputStream(sock.getOutputStream()); @@ -122,7 +122,7 @@ String line; String[] get = null; // GETリクエストをスペースで区切った配列 while ((line = in.readLine()) != null) { - System.out.println(line); + System.out.println("[Web] " +line); // 先頭がGETだったら if (line.toLowerCase().startsWith("get ")) { get = line.split(" "); // GET / HTTP/1.1 をスペースで区切った配列get を得る @@ -211,7 +211,7 @@ // (Thttpdが動的に生成した情報)".getBytes()); // dostr.write(LocalDateTime.now().toString().getBytes()); // } - + System.out.println("---[Web end]"); // 接続終了 sock.close(); if (infile != null)