You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ma...@apache.org on 2014/12/15 18:12:14 UTC
svn commit: r1643057 - in /db/derby/code/branches/10.11: ./
java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
java/drda/org/apache/derby/loc/drda/messages_en.properties
Author: mamta
Date: Wed Dec 3 04:19:35 2014
New Revision: 1643057
URL: http://svn.apache.org/r1643057
Log:
DERBY-6768(List the enabled protocols in derby.log for network server configuration)
Backport to 10.11
Modified:
db/derby/code/branches/10.11/ (props changed)
db/derby/code/branches/10.11/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/branches/10.11/java/drda/org/apache/derby/loc/drda/messages_en.properties
Propchange: db/derby/code/branches/10.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 3 04:19:35 2014
@@ -1,4 +1,4 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
/db/derby/code/branches/10.8:1177474,1234973,1464951
/db/derby/code/branches/10.9:1373148
-/db/derby/code/trunk:1063809,1614963,1615140,1615565,1615821,1615982,1616111-1616112,1616163,1616299,1616332,1616334-1616335,1616365,1616523,1617641,1617737,1618088,1618114,1618544,1618821,1618859,1618881,1618930,1618955,1619154,1619456,1620378-1620379,1620385,1620539,1620608,1620961,1620964,1621215,1622631,1625904,1626094,1626825,1627671,1627851,1628008,1628960,1629099,1629192,1629251,1630598,1636509,1636668,1636798
+/db/derby/code/trunk:1063809,1614963,1615140,1615565,1615821,1615982,1616111-1616112,1616163,1616299,1616332,1616334-1616335,1616365,1616523,1617641,1617737,1618088,1618114,1618544,1618821,1618859,1618881,1618930,1618955,1619154,1619456,1620378-1620379,1620385,1620539,1620608,1620961,1620964,1621215,1622631,1625904,1626094,1626825,1627671,1627851,1628008,1628960,1629099,1629192,1629251,1630598,1636509,1636668,1636798,1639804
Modified: db/derby/code/branches/10.11/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1643057&r1=1643056&r2=1643057&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/branches/10.11/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Wed Dec 3 04:19:35 2014
@@ -753,6 +753,25 @@ public final class NetworkServerControlI
}
}
+ /*
+ * DERBY-6768(List the enabled protocols in derby.log for network
+ * server configuration)
+ * Get the enabled protocols so we can list them in the log file
+ */
+ private String getEnabledProtocols(SSLServerSocket sslServerSocket) {
+ //Converting the String array of enabled protocols to a String
+ StringBuffer sbf = new StringBuffer();
+ String[] enabledProtocols = sslServerSocket.getEnabledProtocols();
+ if(enabledProtocols.length > 0){
+
+ sbf.append(enabledProtocols[0]);
+ for(int i=1; i < enabledProtocols.length; i++){
+ sbf.append(", ").append(enabledProtocols[i]);
+ }
+
+ }
+ return sbf.toString();
+ }
/**
* Start a network server
@@ -822,11 +841,17 @@ public final class NetworkServerControlI
break;
case SSL_BASIC:
consolePropertyMessage("DRDA_SSLReady.I", new String []
- {Integer.toString(portNumber), att_srvclsnm, versionString});
+ {Integer.toString(portNumber), att_srvclsnm, versionString});
+ consolePropertyMessage("DRDA_EnabledProtocols.I", new String []
+ {getEnabledProtocols((SSLServerSocket) serverSocket),
+ att_srvclsnm, versionString});
break;
case SSL_PEER_AUTHENTICATION:
consolePropertyMessage("DRDA_SSLClientAuthReady.I", new String []
{Integer.toString(portNumber), att_srvclsnm, versionString});
+ consolePropertyMessage("DRDA_EnabledProtocols.I", new String []
+ {getEnabledProtocols((SSLServerSocket) serverSocket),
+ att_srvclsnm, versionString});
break;
}
@@ -1002,7 +1027,6 @@ public final class NetworkServerControlI
ex.printStackTrace();
}
}
-
//Print the passed exception on the console and ignore it after that
private void consolePrintAndIgnore(String msgProp,
Exception e, boolean printTimeStamp) {
Modified: db/derby/code/branches/10.11/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.11/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1643057&r1=1643056&r2=1643057&view=diff
==============================================================================
--- db/derby/code/branches/10.11/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/branches/10.11/java/drda/org/apache/derby/loc/drda/messages_en.properties Wed Dec 3 04:19:35 2014
@@ -25,6 +25,7 @@ DRDA_NoInputStream.S=Could not get input
DRDA_Ready.I={1} Network Server - {2} started and ready to accept connections on port {0}
DRDA_SSLReady.I={1} Network Server - {2} started and ready to accept SSL connections on port {0}
DRDA_SSLClientAuthReady.I={1} Network Server - {2} started and ready to accept SSL connections with client authentication on port {0}
+DRDA_EnabledProtocols.I={1} Network Server - {2} Enabled Protocols are {0}
DRDA_UnableToAccept.S=Unable to accept connections.
DRDA_ConnNumber.I=Connection number: {0}.
DRDA_ClientSocketError.S=Error on client socket:\n {0}