diff options
author | Shireesh Anjal <shireesh@gluster.com> | 2011-12-12 18:27:10 +0530 |
---|---|---|
committer | Shireesh Anjal <shireesh@gluster.com> | 2011-12-12 18:31:58 +0530 |
commit | 1a405038ab30aadcfb7d2eac33e32a54df537fec (patch) | |
tree | 7a3cf6578c01e441d0717dfd323dbea7d3f65599 /src/org.gluster.storage.management.gateway | |
parent | 5817247af263f4eca3322936e7a65e66ed54f561 (diff) |
Modified ProcessUtil to support passing env variables while executing commands.
Modified ServerUtil to set env variable GMG_VERSION while executing any Gluster script on the gateway.
Diffstat (limited to 'src/org.gluster.storage.management.gateway')
-rw-r--r-- | src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java index 9a8b1409..4f7d125c 100644 --- a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java +++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java @@ -23,7 +23,9 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.servlet.ServletContext; import javax.xml.bind.JAXBContext; @@ -65,6 +67,7 @@ public class ServerUtil { private static final String REMOTE_SCRIPT_GET_FILE_SYSTEM_TYPE = "get_filesystem_type.py"; private static final String REMOTE_SCRIPT_BASE_DIR = "/opt/glustermg"; private static final String REMOTE_SCRIPT_DIR_NAME = "backend"; + private static final String ENV_GMG_VERSION = "GMG_VERSION"; public void setSshUtil(SshUtil sshUtil) { this.sshUtil = sshUtil; @@ -80,7 +83,12 @@ public class ServerUtil { command.add(SCRIPT_COMMAND); command.add(getScriptPath(scriptName)); command.addAll(arguments); - return ProcessUtil.executeCommand(runInForeground, command); + + // Set the Gateway Version number in an env variable which will be available to the script being executed. + Map<String, String> env = new HashMap<String, String>(1); + env.put(ENV_GMG_VERSION, appVersion); + + return ProcessUtil.executeCommand(runInForeground, command, env); } private String getScriptPath(String scriptName) { |