Author: indika Date: Fri Jan 9 04:14:18 2009 New Revision: 28613 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=28613
Log: fix for CACONS-198 Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=28613&r1=28612&r2=28613&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java Fri Jan 9 04:14:18 2009 @@ -313,6 +313,10 @@ public static String SYNAPSE_STARTUP_TASK_SCHEDULER = "synapse.startup.taskscheduler"; public static String SYNAPSE_STARTUP_TASK_DESCRIPTIONS_REPOSITORY = "synapse.startup.taskdescriptions.repository"; + + public static String SERVER_HOST ="SERVER_HOST"; + + public static String SERVER_IP ="SERVER_IP"; // Known transport error codes public static final int RCV_IO_ERROR_SENDING = 101000; Modified: branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java?rev=28613&r1=28612&r2=28613&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java (original) +++ branches/synapse/1.2.wso2v1/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseInitializationModule.java Fri Jan 9 04:14:18 2009 @@ -33,11 +33,12 @@ import org.apache.synapse.ServerManager; import org.apache.synapse.SynapseConstants; import org.apache.synapse.SynapseException; -import org.apache.synapse.eventing.SynapseEventSource; import org.apache.synapse.commons.util.datasource.DataSourceInformationRepositoryHelper; +import org.apache.synapse.config.Entry; import org.apache.synapse.config.SynapseConfiguration; import org.apache.synapse.config.SynapseConfigurationBuilder; import org.apache.synapse.config.SynapsePropertiesLoader; +import org.apache.synapse.eventing.SynapseEventSource; import org.apache.synapse.format.BinaryBuilder; import org.apache.synapse.format.PlainTextBuilder; @@ -60,25 +61,27 @@ public void init(ConfigurationContext configurationContext, AxisModule axisModule) throws AxisFault { + String ipAddr = ""; + String hostName = ""; log.info("Initializing Synapse at : " + new Date()); try { InetAddress addr = InetAddress.getLocalHost(); if (addr != null) { // Get IP Address - String ipAddr = addr.getHostAddress(); + ipAddr = addr.getHostAddress(); if (ipAddr != null) { MDC.put("ip", ipAddr); } - // Get hostname - String hostname = addr.getHostName(); - if (hostname == null) { - hostname = ipAddr; + // Get hostName + hostName = addr.getHostName(); + if (hostName == null) { + hostName = ipAddr; } - MDC.put("host", hostname); + MDC.put("host", hostName); } } catch (UnknownHostException e) { - log.warn("Unable to determine hostname or IP address of the server for logging", e); + log.warn("Unable to determine hostName or IP address of the server for logging", e); } // incase of an existing running axis2 instance is used to deploy synapse @@ -96,6 +99,18 @@ log.info("Initializing the Synapse configuration ..."); synCfg = getConfiguration(configurationContext); + if (hostName != null && !"".equals(hostName)) { + Entry entry = new Entry(SynapseConstants.SERVER_HOST); + entry.setValue(hostName); + synCfg.addEntry(SynapseConstants.SERVER_HOST, entry); + } + + if (ipAddr != null && !"".equals(ipAddr)) { + Entry entry = new Entry(SynapseConstants.SERVER_IP); + entry.setValue(ipAddr); + synCfg.addEntry(SynapseConstants.SERVER_IP, entry); + } + log.info("Deploying the Synapse service.."); // Dynamically initialize the Synapse Service and deploy it into Axis2 AxisConfiguration axisCfg = configurationContext.getAxisConfiguration(); _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
