mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-01-19 05:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Suspend instances in Apitest by CSV list in apitest.properties

Browse Source 
Enable instances to be suspended in debugging mode by the inclusion of the
instance name in a CSV list in apitest.properties
This commit is contained in:
AllyKaz 2023-06-10 11:39:44 +01:00
parent c8c256f958
commit b5b68b52ce
No known key found for this signature in database
GPG Key ID: 9153AC3079E198F8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apitest/src/main/java/bisq/apitest/config/ApiTestConfig.java
View File

@ -85,6 +85,8 @@ public class ApiTestConfig {
static final String ENABLE_BISQ_DEBUGGING = "enableBisqDebugging"; static final String ENABLE_BISQ_DEBUGGING = "enableBisqDebugging";
static final String REGISTER_DISPUTE_AGENTS = "registerDisputeAgents"; static final String REGISTER_DISPUTE_AGENTS = "registerDisputeAgents";
static final String SUSPEND_INSTANCE = "suspendInstance";
// Default values for certain options // Default values for certain options
static final String DEFAULT_CONFIG_FILE_NAME = "apitest.properties"; static final String DEFAULT_CONFIG_FILE_NAME = "apitest.properties";
@ -126,6 +128,8 @@ public class ApiTestConfig {
public final String baseBuildResourcesDir; public final String baseBuildResourcesDir;
public final String baseSrcResourcesDir; public final String baseSrcResourcesDir;
public final String suspendedInstances;
// The parser that will be used to parse both cmd line and config file options // The parser that will be used to parse both cmd line and config file options
private final OptionParser parser = new OptionParser(); private final OptionParser parser = new OptionParser();
@ -261,6 +265,12 @@ public class ApiTestConfig {
.withRequiredArg() .withRequiredArg()
.ofType(Boolean.class) .ofType(Boolean.class)
.defaultsTo(true); .defaultsTo(true);
ArgumentAcceptingOptionSpec<String> suspendInstancesOpt =
parser.accepts(SUSPEND_INSTANCE, "Suspended the given instances when debugging")
.withRequiredArg()
.ofType(String.class)
.defaultsTo(EMPTY);
try { try {
CompositeOptionSet options = new CompositeOptionSet(); CompositeOptionSet options = new CompositeOptionSet();
@ -319,6 +329,7 @@ public class ApiTestConfig {
this.callRateMeteringConfigPath = options.valueOf(callRateMeteringConfigPathOpt); this.callRateMeteringConfigPath = options.valueOf(callRateMeteringConfigPathOpt);
this.enableBisqDebugging = options.valueOf(enableBisqDebuggingOpt); this.enableBisqDebugging = options.valueOf(enableBisqDebuggingOpt);
this.registerDisputeAgents = options.valueOf(registerDisputeAgentsOpt); this.registerDisputeAgents = options.valueOf(registerDisputeAgentsOpt);
this.suspendedInstances = options.valueOf(suspendInstancesOpt);
// Assign values to special-case static fields. // Assign values to special-case static fields.
BASH_PATH_VALUE = bashPath; BASH_PATH_VALUE = bashPath;

6
apitest/src/main/java/bisq/apitest/linux/BisqProcess.java
View File

@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -66,8 +67,9 @@ public class BisqProcess extends AbstractLinuxProcess implements LinuxProcess {
this.useDevPrivilegeKeys = true; this.useDevPrivilegeKeys = true;
this.findBisqPidScript = (config.isRunningTest ? "." : "./apitest") this.findBisqPidScript = (config.isRunningTest ? "." : "./apitest")
+ "/scripts/get-bisq-pid.sh"; + "/scripts/get-bisq-pid.sh";
this.debugOpts = config.enableBisqDebugging this.debugOpts = config.enableBisqDebugging ? " -agentlib:jdwp=transport=dt_socket,server=y,"
? " -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:" + bisqAppConfig.remoteDebugPort + "suspend=" + (Arrays.asList(config.suspendedInstances.split(",")).contains(bisqAppConfig.name()) ? "y" : "n")
+ ",address=*:" + bisqAppConfig.remoteDebugPort
: ""; : "";
} }