add support for substituting engineName in sync.url

JumpMind · Apr 10, 2012 · 1f2ad24 · 1f2ad24
1 parent b3f4e43
commit 1f2ad24
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java b/...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/ParameterService.java
@@ -256,11 +256,11 @@ public void setParameterFilter(IParameterFilter parameterFilter) {
     }
 
     public String getExternalId() {
-        return getWithHostName(ParameterConstants.EXTERNAL_ID);
+        return substituteVariables(ParameterConstants.EXTERNAL_ID);
     }
 
     public String getSyncUrl() {
-        return getWithHostName(ParameterConstants.SYNC_URL);
+        return substituteVariables(ParameterConstants.SYNC_URL);
     }
 
     public List<DatabaseParameter> getDatabaseParametersFor(String paramKey) {
@@ -272,7 +272,7 @@ public TypedProperties getDatabaseParametersByNodeGroupId(String nodeGroupId) {
         return rereadDatabaseParameters(ParameterConstants.ALL, nodeGroupId);
     }
 
-    protected String getWithHostName(String paramKey) {
+    protected String substituteVariables(String paramKey) {
         String value = getString(paramKey);
         if (!StringUtils.isBlank(value)) {
             if (value.contains("hostName")) {
@@ -281,6 +281,9 @@ protected String getWithHostName(String paramKey) {
             if (value.contains("ipAddress")) {
                 value = FormatUtils.replace("ipAddress", AppUtils.getIpAddress(), value);
             }
+            if (value.contains("engineName")) {
+                value = FormatUtils.replace("engineName", getEngineName(), value);
+            }
         }
         return value;
     }