Skip to content

move jetty module to Lifecycle.Stage.LAST #7215

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
gianm merged 1 commit into from
Mar 9, 2019
Merged

move jetty module to Lifecycle.Stage.LAST #7215

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions integration-tests/src/test/java/org/apache/druid/tests/security/ITTLSTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.inject.Inject;
import org.apache.druid.guice.annotations.Client;
import org.apache.druid.guice.http.DruidHttpClientConfig;
import org.apache.druid.guice.http.LifecycleUtils;
import org.apache.druid.https.SSLClientConfig;
import org.apache.druid.java.util.common.ISE;
import org.apache.druid.java.util.common.StringUtils;
Expand Down Expand Up @@ -391,7 +390,7 @@ private HttpClient makeCustomHttpClient(

HttpClient client = HttpClientInit.createClient(
builder.build(),
LifecycleUtils.asMmxLifecycle(lifecycle)
lifecycle
);

HttpClient adminClient = new CredentialedHttpClient(
Expand All @@ -418,7 +417,7 @@ private HttpClient makeCertlessClient()

HttpClient client = HttpClientInit.createClient(
builder.build(),
LifecycleUtils.asMmxLifecycle(lifecycle)
lifecycle
);

HttpClient adminClient = new CredentialedHttpClient(
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/apache/druid/guice/http/HttpClientModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public HttpClient get()

HttpClient client = HttpClientInit.createClient(
builder.build(),
LifecycleUtils.asMmxLifecycle(getLifecycleProvider().get())
getLifecycleProvider().get()
);

if (isEscalated) {
Expand Down
52 changes: 0 additions & 52 deletions server/src/main/java/org/apache/druid/guice/http/LifecycleUtils.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion server/src/main/java/org/apache/druid/server/initialization/jetty/JettyServerModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,8 @@ public void stop()
log.warn(e, "Unable to stop Jetty server.");
}
}
}
},
Lifecycle.Stage.LAST
);

return server;
Expand Down
3 changes: 1 addition & 2 deletions server/src/test/java/org/apache/druid/server/initialization/BaseJettyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.google.inject.Key;
import com.google.inject.servlet.GuiceFilter;
import org.apache.druid.guice.annotations.Self;
import org.apache.druid.guice.http.LifecycleUtils;
import org.apache.druid.java.util.common.lifecycle.Lifecycle;
import org.apache.druid.java.util.http.client.HttpClient;
import org.apache.druid.java.util.http.client.HttpClientConfig;
Expand Down Expand Up @@ -119,7 +118,7 @@ public static class ClientHolder
try {
this.client = HttpClientInit.createClient(
new HttpClientConfig(maxClientConnections, SSLContext.getDefault(), Duration.ZERO),
LifecycleUtils.asMmxLifecycle(druidLifecycle)
druidLifecycle
);
}
catch (Exception e) {
Expand Down