Skip to content

cleanup-jooby-executor #1153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jknack merged 1 commit into from
Jun 25, 2018
Merged

cleanup-jooby-executor #1153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions modules/jooby-executor/src/main/java/org/jooby/exec/Exec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ public class Exec implements Module {

private int priority = Thread.NORM_PRIORITY;

private Map<String, Throwing.Function4<String, Integer, Supplier<ThreadFactory>, Map<String, Object>, ExecutorService>> f =
private final Map<String, Throwing.Function4<String, Integer, Supplier<ThreadFactory>, Map<String, Object>, ExecutorService>> f =
/** executor factory. */
ImmutableMap
.of(
Expand All @@ -377,7 +377,7 @@ public class Exec implements Module {
return new ForkJoinPool(n, fjwtf(name), null, asyncMode);
});

private String namespace;
private final String namespace;

protected Exec(final String namespace) {
this.namespace = namespace;
Expand Down Expand Up @@ -459,14 +459,10 @@ protected void configure(final Env env, final Config conf, final Binder binder,
services.stream()
.filter(it -> it.getKey().equals("default"))
.findFirst()
.ifPresent(e -> {
bind(binder, null, e.getValue());
});
.ifPresent(e -> bind(binder, null, e.getValue()));

env.onStop(() -> {
services.forEach(exec -> Try.run(() -> exec.getValue().shutdown()).onFailure(cause -> {
log.error("shutdown of {} resulted in error", exec.getKey(), cause);
}));
services.forEach(exec -> Try.run(() -> exec.getValue().shutdown()).onFailure(cause -> log.error("shutdown of {} resulted in error", exec.getKey(), cause)));
services.clear();
});
}
Expand Down Expand Up @@ -528,8 +524,7 @@ private static List<Map<String, Object>> executors(final ConfigValue candidate,
for (Entry<String, ConfigValue> executor : conf.entrySet()) {
String name = executor.getKey();
Object value = executor.getValue().unwrapped();
Map<String, Object> options = new HashMap<>();
options.putAll(executor(name, daemon, priority, n, value));
Map<String, Object> options = new HashMap<>(executor(name, daemon, priority, n, value));
result.add(options);
}
return result;
Expand All @@ -556,8 +551,7 @@ private static Map<String, Object> executor(final String name, final boolean dae
Integer.parseInt(config.get("size").toString()) : n);
options.put("daemon", config.containsKey("daemon") ?
Boolean.parseBoolean(config.get("daemon").toString()) : daemon);
options.put("asyncMode", config.containsKey("asyncMode") ?
Boolean.parseBoolean(config.get("asyncMode").toString()) : false);
options.put("asyncMode", config.containsKey("asyncMode") && Boolean.parseBoolean(config.get("asyncMode").toString()));
options.put("priority", config.containsKey("priority") ?
Integer.parseInt(config.get("priority").toString()) : priority);
} else {
Expand All @@ -567,15 +561,20 @@ private static Map<String, Object> executor(final String name, final boolean dae
String[] opt = option.split("=");
String optname = opt[0].trim();
Object optvalue;
if (optname.equals("daemon")) {
optvalue = opt.length > 1 ? Boolean.parseBoolean(opt[1].trim()) : daemon;
} else if (optname.equals("asyncMode")) {
optvalue = opt.length > 1 ? Boolean.parseBoolean(opt[1].trim()) : false;
} else if (optname.equals("priority")) {
optvalue = opt.length > 1 ? Integer.parseInt(opt[1].trim()) : priority;
} else {
optvalue = opt.length > 1 ? Integer.parseInt(opt[1].trim()) : n;
options.put("type", optname);
switch (optname) {
case "daemon":
optvalue = opt.length > 1 ? Boolean.parseBoolean(opt[1].trim()) : daemon;
break;
case "asyncMode":
optvalue = opt.length > 1 && Boolean.parseBoolean(opt[1].trim());
break;
case "priority":
optvalue = opt.length > 1 ? Integer.parseInt(opt[1].trim()) : priority;
break;
default:
optvalue = opt.length > 1 ? Integer.parseInt(opt[1].trim()) : n;
options.put("type", optname);
break;
}
options.put(optname, optvalue);
}
Expand Down