Commit Graph

6822 Commits

Author SHA1 Message Date
Andy Wilkinson b79ee145d6 Configure worker for Undertow’s access log to use daemon threads
Previously, the worker used non-daemon threads which meant that they
prevented the JVM from shutting down. Ideally, we’d avoid this problem
by closing the worker and access log receiver as part of stopping
Undertow, however, due to an apparent bug in Undertow [1], it’s not
possible to do so cleanly.

This commit configures the access log worker to use daemon threads so
that they do not prevent the JVM from shutting down. Unfortunately,
this means that the threads will still be running after the context has
been closed but before the JVM shuts down but that appears to be
unavoidable due to the aforementioned Undertow bug.

Closes gh-4793

[1] https://issues.jboss.org/browse/UNDERTOW-597
2015-12-17 11:30:34 +00:00
Andy Wilkinson 408a302f44 Revert "Upgrade to Spring Data Gosling snapshots again"
This reverts commit 00ba7bea36.

See gh-4786
2015-12-17 11:30:34 +00:00
Phillip Webb 506ee897f3 Document how to configure root logging level
Fixes gh-2872
2015-12-17 10:55:46 +00:00
Phillip Webb 5d311d6203 Polish 2015-12-17 09:51:33 +00:00
Phillip Webb ec2064d981 Remove TODO
See gh-4796
2015-12-17 09:51:33 +00:00
Stephane Nicoll eaddb4f0db Merge branch '1.2.x' 2015-12-17 10:21:29 +01:00
Stephane Nicoll b719b0271c Upgrade to Spring Framework 4.1.9.RELEASE
Closes gh-4440
2015-12-17 10:20:17 +01:00
Andy Wilkinson bbe6f232dc Merge branch '1.2.x' 2015-12-17 08:35:31 +00:00
Andy Wilkinson c0c79ab906 Revert "Upgrade to Spring Web Services 2.2.4.RELEASE"
This reverts commit acb3fb5399.

See gh-4789
2015-12-17 08:34:15 +00:00
Phillip Webb ff2addb321 Fix checkstyle 2015-12-16 22:54:01 +00:00
Phillip Webb 91c801d6fe Add how-to log to file without console section
Fixes gh-4388
2015-12-16 22:25:13 +00:00
Phillip Webb 40abd13813 Be defensive about hiding log errors
Ensure that log configuration errors always get reported.
2015-12-16 22:25:13 +00:00
Phillip Webb 528fcf3d0b Refine server.server-header documentation
Fixes gh-4461
2015-12-16 22:25:12 +00:00
Phillip Webb 945b42588b Refine server.server-header documentation
Fixes gh-4461
2015-12-16 21:11:49 +00:00
Phillip Webb 4bdb2d34cc Merge pull request #4784 from kirill-vlasov
* pr/4784:
  Make loggers private static final
2015-12-16 21:04:00 +00:00
Kirill Vlasov ec2f33f986 Make loggers private static final
Apply consistency across all static loggers.

Closes gh-4784
2015-12-16 21:02:53 +00:00
Phillip Webb 0b1dc94b93 Merge pull request #4783 from kirill-vlasov
* pr/4783:
  Use Collections.isEmpty() instead of .size() == 0
2015-12-16 21:01:42 +00:00
Kirill Vlasov 786aacf2e9 Use Collections.isEmpty() instead of .size() == 0
Ensure that Collections.isEmpty() is used to check if there are no
elements in a collections. This is more explicit and can be faster than
calling .size().

Closes gh-4783
2015-12-16 20:59:33 +00:00
Andy Wilkinson 6113643cbe Merge branch '1.2.x' 2015-12-16 20:06:51 +00:00
Andy Wilkinson 43a16146ef Upgrade to Spring Integration 4.1.8.RELEASE
Closes gh-4719
2015-12-16 20:05:04 +00:00
Phillip Webb 5e84bfd91b Merge branch '1.2.x' 2015-12-16 18:45:42 +00:00
Phillip Webb ce2a68276c Add ServletContext initialization documentation
Update the documentation to include a section about ServletContext
initialization with embedded servlet containers. This update is to
primarily highlight that `WebApplicationInitializers` and Servlet 3.0+
`ServletContainerInitializers` are not called.

Fixes gh-4643
2015-12-16 18:41:46 +00:00
Dave Syer 471947b400 Be more defensive when instantiating custom ServerProperties
If the user provides their own ServerProperties bean we want to peek
at it to see if they set the port (and only that) when we are deciding
if the actuator context needs to be created. This happens very early
(in a @Condition) so we need to be very defensive. There are already
quite a few checks in place to prevent a ServerProperties bean from
being instantiated unless we really need it, and yet, when it is
we can do more.

This change creates the bean (and the ManagementProperties) in a
throwaway BeanFactory using the same BeanDefinition as the main
context. This ensures that when the main context bean is created
it will be in the "natural" order and binding to the Environment
can take place as normal.

Fixes gh-4631
2015-12-16 17:48:28 +00:00
Andy Wilkinson aae5d11d5d Upgrade to Embedded Mongo 1.50.1
Closes gh-4790
2015-12-16 17:30:35 +00:00
Andy Wilkinson 794db8afb5 Upgrade to Undertow 1.3.10.Final
Closes gh-4791
2015-12-16 17:30:03 +00:00
Andy Wilkinson 5eeab3a494 Merge branch '1.2.x' 2015-12-16 17:17:06 +00:00
Andy Wilkinson acb3fb5399 Upgrade to Spring Web Services 2.2.4.RELEASE
Closes gh-4789
2015-12-16 17:16:11 +00:00
Andy Wilkinson 00ba7bea36 Upgrade to Spring Data Gosling snapshots again
The issue with Spring Data Gemfire has been resolved [1]

See gh-4786

[1] 34665d16ec
2015-12-16 17:10:18 +00:00
Andy Wilkinson f93303a229 Merge pull request #4506 from michitomo
* gh-4506:
  Update launch.script to append to $log_file rather than overwriting it
2015-12-16 17:05:32 +00:00
Michitomo Nakahara 2b5b7cd81e Update launch.script to append to $log_file rather than overwriting it
Closes gh-4506
2015-12-16 17:05:29 +00:00
Stephane Nicoll a86250322f Revert d106f66 2015-12-16 17:19:33 +01:00
Stephane Nicoll d106f6697f Upgrade to Spring Data Gosling SR2 snapshots
See gh-4786
2015-12-16 15:17:03 +01:00
Andy Wilkinson 02e1d669df Exit with a value of 1 when cd fails in the init script
Exiting with 0 when cd fails is likely to be incorrectly interpreted
as success so we should exit with a non-zero value. Ideally, the init
script status action would exit with 4 but, at the point when
the cd is performed, we don’t even know if we’re running as an init
script. Exiting with 1 seems to be a reasonable compromise as it’s
fine for the non init-script case as well as being correct for all
init script actions other than status.

See gh-4653
2015-12-16 13:53:26 +00:00
Andy Wilkinson 81a4763940 Address problems in launch.script reported by Shellcheck 0.4.1
Closes gh-4653
2015-12-16 13:24:28 +00:00
Andy Wilkinson 3352e60631 Remove use of diamond operator in tests so that they’re Java 6 compatible
See gh-4163
2015-12-16 11:40:17 +00:00
Andy Wilkinson 037a27e257 Add a workaround for DATACMNS-776
Spring Data’s web support includes a handler method argument resolver,
ProxyingHandlerMethodArgumentResolver, that inaccurately claims that it
can handle all interface handler method arguments. This causes problems
for handler methods that take Spring Mobile’s Device as an argument as
the proxied Device instance does not behave correctly.

This commit works around the problem by assigning an order to the 
WebMvcConfigurerAdapter that registers Spring Mobile’s argument resolver
with Spring MVC. This ordering ensures that Spring Mobile’s resolver
takes precedence over Spring Data’s for Device arguments.

Closes gh-4163
2015-12-16 11:13:34 +00:00
Dave Syer c7c685f65f Disable hypermedia in actuator endpoints by default
This change permanently removes links from the endpoints that return
arrays or collections, and also disables them in the rest of the
endpoints (except /actuator) by default.

Fixes gh-4616
2015-12-16 11:00:22 +00:00
Andy Wilkinson 860a9b94ea Add the docs endpoint to the table of Actuator endpoints
Closes gh-4597
2015-12-16 10:42:55 +00:00
Phillip Webb 0ed9ef4912 Merge pull request #4686 from jadekler/log_order
* pr/4686:
  Log exception before sending to listeners
2015-12-16 10:36:55 +00:00
Jean de Klerk e9eae2cc1e Log exception before sending to listeners
Change SpringApplication exception handling to log details before calling
the SpringApplicationRunListeners. Prior to this commit it wasn't possible
for a listener to shutdown logging.

Fixes gh-4680
Closes gh-4686
2015-12-16 10:33:57 +00:00
Phillip Webb 80b305015e Merge pull request #4780 from Jacob-Swanson/mail-test-exception-message
* pr/4780:
  Fix mail connection test exception message
2015-12-16 10:26:13 +00:00
Jacob Swanson ae565b805a Fix mail connection test exception message
Closes gh-4780
2015-12-16 10:25:47 +00:00
Phillip Webb 5a1ee6ebe8 Allow easy opt-out of using start-stop-daemon
Allow users to easily opt-opt of using the start-stop-daemon in the
launch script. This may be required on distros that include older
versions.

Fixes gh-4732
2015-12-15 20:37:43 +00:00
Phillip Webb 8c15905040 Merge pull request #3847 from akonczak/master
* pr/3847:
  Auto-configure Elasticsearch converter and context
2015-12-15 20:08:43 +00:00
Artur Konczak 786f025818 Auto-configure Elasticsearch converter and context
Extend ElasticsearchDataAutoConfiguration to also configure an
ElasticsearchConverter and SimpleElasticsearchMappingContext both
of which are required for Spring Data REST.

Closes gh-3847
2015-12-15 20:03:41 +00:00
Phillip Webb fce75ebaa8 Fix checkstyle error
See gh-4765
See gh-4766
2015-12-15 15:09:58 +00:00
Phillip Webb b747b6c7b2 Merge pull request #4760 from mbenson/issue-4759
* pr/4760:
  Upgrade to maven-invoker-plugin 1.10
2015-12-15 15:05:20 +00:00
Matt Benson ea7a758901 Upgrade to maven-invoker-plugin 1.10
Closes gh-4760
2015-12-15 15:05:08 +00:00
Andy Wilkinson bcaee0ebee Perform initialization in foreground if BackgroundPreinitializer fails
Google App Engine probits the creation of new threads. This leads to a
failure in BackgroundPreinitializer when the single thread executor
attempts to create its single thread.

This commit enhances the existing fail safety of
BackgroundPreinitializer by catching any exceptions thrown while
creating the executor and submitting the tasks to it. Any initialisation
that has not performed in the background will be performed in the
foreground instead.

Closes gh-4662
2015-12-15 14:59:24 +00:00
Phillip Webb da50eb9ab2 Merge pull request #4766 from mbenson/issue-4765
* pr/4766:
  Use canonical paths for Undertow document root
2015-12-15 14:56:33 +00:00