#35 Add `address` variable to creator/server executable
This commit is contained in:
parent
75a872252f
commit
8b77434ccf
|
@ -90,6 +90,7 @@ public class InternalSubCreator extends SubCreator {
|
||||||
var.put("template", template.getName());
|
var.put("template", template.getName());
|
||||||
var.put("type", template.getType().toString().toUpperCase());
|
var.put("type", template.getType().toString().toUpperCase());
|
||||||
var.put("version", version.toString());
|
var.put("version", version.toString());
|
||||||
|
var.put("address", host.getAddress().getHostAddress());
|
||||||
var.put("port", Integer.toString(port));
|
var.put("port", Integer.toString(port));
|
||||||
switch (template.getType()) {
|
switch (template.getType()) {
|
||||||
case SPONGE:
|
case SPONGE:
|
||||||
|
|
|
@ -121,6 +121,7 @@ public class InternalSubServer extends SubServerContainer {
|
||||||
try {
|
try {
|
||||||
ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.getCreator().getBashDirectory(), executable)).directory(directory);
|
ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.getCreator().getBashDirectory(), executable)).directory(directory);
|
||||||
pb.environment().put("name", getName());
|
pb.environment().put("name", getName());
|
||||||
|
pb.environment().put("address", host.getAddress().getHostAddress());
|
||||||
pb.environment().put("port", Integer.toString(getAddress().getPort()));
|
pb.environment().put("port", Integer.toString(getAddress().getPort()));
|
||||||
process = pb.start();
|
process = pb.start();
|
||||||
System.out.println("SubServers > Now starting " + getName());
|
System.out.println("SubServers > Now starting " + getName());
|
||||||
|
|
|
@ -235,6 +235,7 @@ public class SubCreator {
|
||||||
var.put("template", template.getName());
|
var.put("template", template.getName());
|
||||||
var.put("type", template.getType().toString().toUpperCase());
|
var.put("type", template.getType().toString().toUpperCase());
|
||||||
var.put("version", version.toString());
|
var.put("version", version.toString());
|
||||||
|
var.put("address", host.config.get().getSection("Settings").getRawString("Server-Bind"));
|
||||||
var.put("port", Integer.toString(port));
|
var.put("port", Integer.toString(port));
|
||||||
switch (template.getType()) {
|
switch (template.getType()) {
|
||||||
case SPONGE:
|
case SPONGE:
|
||||||
|
|
|
@ -110,6 +110,7 @@ public class SubServer {
|
||||||
try {
|
try {
|
||||||
ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.host.getRawString("Git-Bash"), executable)).directory(directory);
|
ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.host.getRawString("Git-Bash"), executable)).directory(directory);
|
||||||
pb.environment().put("name", getName());
|
pb.environment().put("name", getName());
|
||||||
|
pb.environment().put("address", host.config.get().getSection("Settings").getRawString("Server-Bind"));
|
||||||
pb.environment().put("port", Integer.toString(getPort()));
|
pb.environment().put("port", Integer.toString(getPort()));
|
||||||
process = pb.start();
|
process = pb.start();
|
||||||
falsestart = false;
|
falsestart = false;
|
||||||
|
|
Loading…
Reference in New Issue