Skip to content

Commit

Permalink
Server process should not allow passthrough.
Browse files Browse the repository at this point in the history
The server process does not accept any args.
  • Loading branch information
ketan committed Apr 16, 2019
1 parent 46cdda1 commit 35c13cd
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions installers/osx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ enum Type {
[
AGENT_STARTUP_ARGS: '-Xms128m -Xmx256m'
],
[]),
[], true),

sever("Go Server", "go-server", "go.jar", "go-server-wrapper.log",
[:],
Expand All @@ -57,29 +57,30 @@ enum Type {
'-XX:MaxMetaspaceSize=400m',
'-Duser.language=en',
'-Duser.country=US',
])
], false)

final String appName
final String baseName
final String jarFileName
final String logFileName
final Map<String, String> additionalEnvVars
final List<String> jvmArgs

final boolean allowPassthrough

Type(String appName,
String baseName,
String jarFileName,
String logFileName,
Map<String, String> additionalEnvVars,
List<String> jvmArgs) {

List<String> jvmArgs,
boolean allowPassthrough) {
this.jvmArgs = jvmArgs
this.additionalEnvVars = additionalEnvVars
this.logFileName = logFileName
this.jarFileName = jarFileName
this.baseName = baseName
this.appName = appName
this.allowPassthrough = allowPassthrough
}
}

Expand Down Expand Up @@ -118,7 +119,7 @@ def configureOSXZip(Zip zipTask,
eachLine = 'PIDDIR="../run"'
}

if (eachLine == '#PASS_THROUGH=true') {
if (eachLine == '#PASS_THROUGH=true' && type.allowPassthrough) {
eachLine = 'PASS_THROUGH=true'
}

Expand Down

0 comments on commit 35c13cd

Please sign in to comment.