Browse Source

rename mitmPort, set minimum worker threads to 12

tags/v0.1.8
Jonathan Cobb 4 years ago
parent
commit
5a7bcae0d1
4 changed files with 13 additions and 2 deletions
  1. +1
    -1
      automation/roles/mitmproxy/files/bubble_role.json
  2. +1
    -0
      bubble-server/src/main/java/bubble/server/BubbleConfiguration.java
  3. +10
    -0
      bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java
  4. +1
    -1
      bubble-server/src/main/resources/ansible/default_roles.json

+ 1
- 1
automation/roles/mitmproxy/files/bubble_role.json View File

@@ -6,7 +6,7 @@
"config": [
{"name": "admin_port", "value": "[[node.adminPort]]"},
{"name": "bubble_network", "value": "[[node.network]]"},
{"name": "mitm_port", "value": "[[configuration.mitmPort]]"}
{"name": "mitm_port", "value": "[[configuration.defaultMitmProxyPort]]"}
],
"tgzB64": ""
}

+ 1
- 0
bubble-server/src/main/java/bubble/server/BubbleConfiguration.java View File

@@ -78,6 +78,7 @@ public class BubbleConfiguration extends PgRestServerConfiguration
public BubbleConfiguration (BubbleConfiguration other) { copy(this, other); }

@Getter @Setter private int defaultNodeSslPort = 1443;
@Getter @Setter private int defaultMitmProxyPort = 8888;

@Getter @Setter private LocalNotificationStrategy localNotificationStrategy = LocalNotificationStrategy.inline;
public LocalNotificationStrategy localNotificationStrategy() {


+ 10
- 0
bubble-server/src/main/java/bubble/server/listener/NodeInitializerListener.java View File

@@ -23,6 +23,8 @@ import static org.cobbzilla.util.time.TimeUtil.DATE_FORMAT_YYYY_MM_DD_HH_mm_ss;
@Slf4j
public class NodeInitializerListener extends RestServerLifecycleListenerBase<BubbleConfiguration> {

private static final int MIN_WORKER_THREADS = 12;

@Override public void beforeStart(RestServer server) {
final BubbleConfiguration c = (BubbleConfiguration) server.getConfiguration();

@@ -33,6 +35,14 @@ public class NodeInitializerListener extends RestServerLifecycleListenerBase<Bub
// ensure locales were loaded correctly
final String[] allLocales = c.getAllLocales();
if (empty(allLocales)) die("beforeStart: no locales found"); // should never happen

// if we are using the 'http' localNotificationStrategy, ensure we have enough worker threads
if (!c.getHttp().hasWorkerThreads() || c.getHttp().getWorkerThreads() < MIN_WORKER_THREADS) {
log.info("beforeStart: http.workerThreads="+c.getHttp().getWorkerThreads()+" is not set or too low, increasing to "+ MIN_WORKER_THREADS);
c.getHttp().setWorkerThreads(MIN_WORKER_THREADS);
} else {
log.info("beforeStart: http.workerThreads="+c.getHttp().getWorkerThreads());
}
}

@Override public void onStart(RestServer server) {


+ 1
- 1
bubble-server/src/main/resources/ansible/default_roles.json View File

@@ -81,7 +81,7 @@
"config": [
{"name": "admin_port", "value": "[[node.adminPort]]"},
{"name": "bubble_network", "value": "[[node.network]]"},
{"name": "mitm_port", "value": "[[configuration.mitmPort]]"}
{"name": "mitm_port", "value": "[[configuration.defaultMitmProxyPort]]"}
],
"tgzB64": ""
},


Loading…
Cancel
Save