Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
df9a6a0f
Commit
df9a6a0f
authored
Jun 12, 2019
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wait for up to 30s for access logs to be written during shutdown
Closes gh-17119
parent
2833f603
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
0 deletions
+10
-0
UndertowReactiveWebServerFactory.java
...b/embedded/undertow/UndertowReactiveWebServerFactory.java
+5
-0
UndertowServletWebServerFactory.java
...eb/embedded/undertow/UndertowServletWebServerFactory.java
+5
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowReactiveWebServerFactory.java
View file @
df9a6a0f
...
@@ -23,6 +23,7 @@ import java.util.ArrayList;
...
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
import
io.undertow.Handlers
;
import
io.undertow.Handlers
;
import
io.undertow.Undertow
;
import
io.undertow.Undertow
;
...
@@ -156,10 +157,14 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
...
@@ -156,10 +157,14 @@ public class UndertowReactiveWebServerFactory extends AbstractReactiveWebServerF
try
{
try
{
accessLogReceiver
.
close
();
accessLogReceiver
.
close
();
worker
.
shutdown
();
worker
.
shutdown
();
worker
.
awaitTermination
(
30
,
TimeUnit
.
SECONDS
);
}
}
catch
(
IOException
ex
)
{
catch
(
IOException
ex
)
{
throw
new
IllegalStateException
(
ex
);
throw
new
IllegalStateException
(
ex
);
}
}
catch
(
InterruptedException
ex
)
{
Thread
.
currentThread
().
interrupt
();
}
};
};
}
}
catch
(
IOException
ex
)
{
catch
(
IOException
ex
)
{
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
View file @
df9a6a0f
...
@@ -28,6 +28,7 @@ import java.util.Collections;
...
@@ -28,6 +28,7 @@ import java.util.Collections;
import
java.util.EventListener
;
import
java.util.EventListener
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Set
;
import
java.util.concurrent.TimeUnit
;
import
javax.servlet.ServletContainerInitializer
;
import
javax.servlet.ServletContainerInitializer
;
import
javax.servlet.ServletContext
;
import
javax.servlet.ServletContext
;
...
@@ -652,10 +653,14 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
...
@@ -652,10 +653,14 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
try
{
try
{
this
.
accessLogReceiver
.
close
();
this
.
accessLogReceiver
.
close
();
this
.
worker
.
shutdown
();
this
.
worker
.
shutdown
();
this
.
worker
.
awaitTermination
(
30
,
TimeUnit
.
SECONDS
);
}
}
catch
(
IOException
ex
)
{
catch
(
IOException
ex
)
{
throw
new
IllegalStateException
(
ex
);
throw
new
IllegalStateException
(
ex
);
}
}
catch
(
InterruptedException
ex
)
{
Thread
.
currentThread
().
interrupt
();
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment