You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2017/04/27 13:07:34 UTC
svn commit: r1792880 - in /uima/uima-ducc/trunk:
uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/
uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/c...
Author: burn
Date: Thu Apr 27 13:07:34 2017
New Revision: 1792880
URL: http://svn.apache.org/viewvc?rev=1792880&view=rev
Log:
UIMA-5404 Simplify by always using the environment for the state update port
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java?rev=1792880&r1=1792879&r2=1792880&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java Thu Apr 27 13:07:34 2017
@@ -133,10 +133,7 @@ public class UimaAsServiceConfiguration
}
// set up agent socket endpoint where this UIMA AS service will send state updates
if ( common.managedProcessStateUpdateEndpointType != null && common.managedProcessStateUpdateEndpointType.equalsIgnoreCase("socket") ) {
- String updatePort = System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort);
- if (updatePort == null) {
- updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
- }
+ String updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
common.managedProcessStateUpdateEndpoint = "mina:tcp://localhost:" + updatePort + agentSocketParams;
}
// set up a socket endpoint where the UIMA AS service will receive events sent from its agent
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1792880&r1=1792879&r2=1792880&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java Thu Apr 27 13:07:34 2017
@@ -778,13 +778,6 @@ public class DuccCommandExecutor extends
cmdLine.addOption("-Dducc.deploy.JpUniqueId="
+ ((ManagedProcess) managedProcess).getDuccId().getUnique());
- if (System.getProperties().containsKey("ducc.agent.managed.process.state.update.endpoint.type")) {
- String type = System.getProperty("ducc.agent.managed.process.state.update.endpoint.type");
- if (type != null && type.equalsIgnoreCase("socket")) {
- cmdLine.addOption("-D" + ProcessStateUpdate.ProcessStateUpdatePort + "="
- + System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort));
- }
- }
// NOTE - These are redundant since the information is also
// in the environment for both Java and non-Java processes
cmdLine.addOption("-Dducc.process.log.dir=" + processLogDir);
@@ -802,7 +795,7 @@ public class DuccCommandExecutor extends
}
// add JobId and the log prefix to the env so additional
// similarly-named log files can be created
- // Also put the state update port in the environment for custom services
+ // Also put the state update port in the environment for all processes ... instead of just some as a system property
processEnv.put(IDuccUser.EnvironmentVariable.DUCC_ID_JOB.value(), String
.valueOf(((ManagedProcess) super.managedProcess)
.getWorkDuccId().getFriendly()));
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1792880&r1=1792879&r2=1792880&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java Thu Apr 27 13:07:34 2017
@@ -202,10 +202,7 @@ public class JobProcessConfiguration {
if (common.managedProcessStateUpdateEndpointType != null
&& common.managedProcessStateUpdateEndpointType
.equalsIgnoreCase("socket")) {
- String updatePort = System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort);
- if (updatePort == null) {
- updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
- }
+ String updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
common.managedProcessStateUpdateEndpoint = AGENT_ENDPOINT + updatePort + agentSocketParams;
}
// set up a socket endpoint where the UIMA AS service will receive
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java?rev=1792880&r1=1792879&r2=1792880&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java Thu Apr 27 13:07:34 2017
@@ -200,10 +200,7 @@ public class ServiceConfiguration {
if (common.managedProcessStateUpdateEndpointType != null
&& common.managedProcessStateUpdateEndpointType
.equalsIgnoreCase("socket")) {
- String updatePort = System.getProperty(ProcessStateUpdate.ProcessStateUpdatePort);
- if (updatePort == null) {
- updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
- }
+ String updatePort = System.getenv(IDuccUser.EnvironmentVariable.DUCC_UPDATE_PORT.value());
common.managedProcessStateUpdateEndpoint = AGENT_ENDPOINT + updatePort + agentSocketParams;
}
// set up a socket endpoint where the UIMA AS service will receive