Skip to content

Control registering of shutdownhook #170

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

Open
JelmerBouma1985 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Control registering of shutdownhook #170

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
25 changes: 18 additions & 7 deletions src/main/java/io/zonky/test/db/postgres/embedded/EmbeddedPostgres.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,26 +106,28 @@ public class EmbeddedPostgres implements Closeable
private volatile FileOutputStream lockStream;
private volatile FileLock lock;
private final boolean cleanDataDirectory;
private final boolean registerShutdownHook;

private final ProcessBuilder.Redirect errorRedirector;
private final ProcessBuilder.Redirect outputRedirector;
private final Process process;

EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory,
EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory, boolean registerShutdownHook,
Map<String, String> postgresConfig, Map<String, String> localeConfig, int port, Map<String, String> connectConfig,
PgBinaryResolver pgBinaryResolver, ProcessBuilder.Redirect errorRedirector, ProcessBuilder.Redirect outputRedirector) throws IOException
{
this(parentDirectory, dataDirectory, cleanDataDirectory, postgresConfig, localeConfig, port, connectConfig,
this(parentDirectory, dataDirectory, cleanDataDirectory, registerShutdownHook, postgresConfig, localeConfig, port, connectConfig,
pgBinaryResolver, errorRedirector, outputRedirector, DEFAULT_PG_STARTUP_WAIT, null, null);
}

EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory,
EmbeddedPostgres(File parentDirectory, File dataDirectory, boolean cleanDataDirectory, boolean registerShutdownHook,
Map<String, String> postgresConfig, Map<String, String> localeConfig, int port, Map<String, String> connectConfig,
PgBinaryResolver pgBinaryResolver, ProcessBuilder.Redirect errorRedirector,
ProcessBuilder.Redirect outputRedirector, Duration pgStartupWait,
File overrideWorkingDirectory, Consumer<File> dataDirectoryCustomizer) throws IOException
{
this.cleanDataDirectory = cleanDataDirectory;
this.registerShutdownHook = registerShutdownHook;
this.postgresConfig = new HashMap<>(postgresConfig);
this.localeConfig = new HashMap<>(localeConfig);
this.connectConfig = new HashMap<>(connectConfig);
Expand Down Expand Up @@ -291,7 +293,9 @@ private Process startPostmaster() throws IOException

LOG.info("{} postmaster started as {} on port {}. Waiting up to {} for server startup to finish.", instanceId, postmaster.toString(), port, pgStartupWait);

Runtime.getRuntime().addShutdownHook(newCloserThread());
if (registerShutdownHook) {
Runtime.getRuntime().addShutdownHook(newCloserThread());
}

waitForServerStartup(watch);
return postmaster;
Expand Down Expand Up @@ -503,6 +507,7 @@ public static class Builder
private final Map<String, String> config = new HashMap<>();
private final Map<String, String> localeConfig = new HashMap<>();
private boolean builderCleanDataDirectory = true;
private boolean builderRegisterShutdownHook = true;
private int builderPort = 0;
private final Map<String, String> connectConfig = new HashMap<>();
private PgBinaryResolver pgBinaryResolver = DefaultPostgresBinaryResolver.INSTANCE;
Expand Down Expand Up @@ -532,6 +537,11 @@ public Builder setCleanDataDirectory(boolean cleanDataDirectory) {
return this;
}

public Builder setRegisterShutdownHook(boolean registerShutdownHook) {
builderRegisterShutdownHook = registerShutdownHook;
return this;
}

public Builder setDataDirectory(Path path) {
return setDataDirectory(path.toFile());
}
Expand Down Expand Up @@ -599,8 +609,8 @@ public EmbeddedPostgres start() throws IOException {
if (builderDataDirectory == null) {
builderDataDirectory = Files.createTempDirectory("epg").toFile();
}
return new EmbeddedPostgres(parentDirectory, builderDataDirectory, builderCleanDataDirectory, config,
localeConfig, builderPort, connectConfig, pgBinaryResolver, errRedirector, outRedirector,
return new EmbeddedPostgres(parentDirectory, builderDataDirectory, builderCleanDataDirectory, builderRegisterShutdownHook,
config, localeConfig, builderPort, connectConfig, pgBinaryResolver, errRedirector, outRedirector,
pgStartupWait, overrideWorkingDirectory, dataDirectoryCustomizer);
}

Expand All @@ -614,6 +624,7 @@ public boolean equals(Object o) {
}
Builder builder = (Builder) o;
return builderCleanDataDirectory == builder.builderCleanDataDirectory &&
builderRegisterShutdownHook == builder.builderRegisterShutdownHook &&
builderPort == builder.builderPort &&
Objects.equals(parentDirectory, builder.parentDirectory) &&
Objects.equals(builderDataDirectory, builder.builderDataDirectory) &&
Expand All @@ -630,7 +641,7 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(parentDirectory, builderDataDirectory, config, localeConfig, builderCleanDataDirectory, builderPort, connectConfig, pgBinaryResolver, pgStartupWait, errRedirector, outRedirector);
return Objects.hash(parentDirectory, builderDataDirectory, config, localeConfig, builderCleanDataDirectory, builderRegisterShutdownHook, builderPort, connectConfig, pgBinaryResolver, pgStartupWait, errRedirector, outRedirector);
}
}

Expand Down