1818import java .util .concurrent .SynchronousQueue ;
1919import java .util .concurrent .ThreadPoolExecutor ;
2020import java .util .concurrent .TimeUnit ;
21+ import java .util .logging .Logger ;
2122
22- import com .microsoft .java .debug .core .Logger ;
23+ import com .microsoft .java .debug .core .Configuration ;
2324import com .microsoft .java .debug .core .adapter .ProtocolServer ;
2425
2526public class JavaDebugServer implements IDebugServer {
27+ private static final Logger logger = Logger .getLogger (Configuration .LOGGER_NAME );
2628 private static JavaDebugServer singletonInstance ;
2729
2830 private ServerSocket serverSocket = null ;
@@ -33,7 +35,7 @@ private JavaDebugServer() {
3335 try {
3436 this .serverSocket = new ServerSocket (0 , 1 );
3537 } catch (IOException e ) {
36- Logger . logException ( "Failed to create Java Debug Server" , e );
38+ logger . severe ( String . format ( "Failed to create Java Debug Server: %s " , e ) );
3739 }
3840 }
3941
@@ -78,7 +80,7 @@ public void run() {
7880 Socket connection = serverSocket .accept ();
7981 executor .submit (createConnectionTask (connection ));
8082 } catch (IOException e1 ) {
81- Logger . logException ( "Setup socket connection exception" , e1 );
83+ logger . severe ( String . format ( "Setup socket connection exception: %s " , e1 ) );
8284 closeServerSocket ();
8385 // If exception occurs when waiting for new client connection, shut down the connection pool
8486 // to make sure no new tasks are accepted. But the previously submitted tasks will continue to run.
@@ -100,10 +102,10 @@ public synchronized void stop() {
100102 private synchronized void closeServerSocket () {
101103 if (serverSocket != null ) {
102104 try {
103- Logger . logInfo ("Close debugserver socket port " + serverSocket .getLocalPort ());
105+ logger . info ("Close debugserver socket port " + serverSocket .getLocalPort ());
104106 serverSocket .close ();
105107 } catch (IOException e ) {
106- Logger . logException ( "Close ServerSocket exception" , e );
108+ logger . severe ( String . format ( "Close ServerSocket exception: %s " , e ) );
107109 }
108110 }
109111 serverSocket = null ;
@@ -128,9 +130,9 @@ public void run() {
128130 // protocol server will dispatch request and send response in a while-loop.
129131 protocolServer .start ();
130132 } catch (IOException e ) {
131- Logger . logException ( "Socket connection exception" , e );
133+ logger . severe ( String . format ( "Socket connection exception: %s " , e ) );
132134 } finally {
133- Logger . logInfo ("Debug connection closed" );
135+ logger . info ("Debug connection closed" );
134136 }
135137 }
136138 };
0 commit comments