root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-02-05 09:25:48 +01:00
parent b9b0cdb342 21e866535c
commit 3d1f8aa8d7
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -215,18 +215,6 @@
"replacement": "spring.info.git.location" "replacement": "spring.info.git.location"
} }
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
},
{
"name": "spring.pid.fail-on-write-error",
"type": "java.lang.Boolean",
"description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
"sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
},
{ {
"name": "spring.pidfile", "name": "spring.pidfile",
"type": "java.lang.String", "type": "java.lang.String",

2
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -123,7 +123,7 @@ content into your application; rather pick only the properties that you need.
# OUTPUT # OUTPUT
spring.output.ansi.enabled=detect # Configure the ANSI output. spring.output.ansi.enabled=detect # Configure the ANSI output.
# PID FILE ({sc-spring-boot-actuator}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter]) # PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file. spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file.
spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used). spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).

2
spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
View File

@ -1550,7 +1550,7 @@ writes a PID file. Example:
[indent=0] [indent=0]
---- ----
org.springframework.context.ApplicationListener=\ org.springframework.context.ApplicationListener=\
org.springframework.boot.actuate.system.ApplicationPidFileWriter,\ org.springframework.boot.system.ApplicationPidFileWriter,\
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
---- ----

12
spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -182,6 +182,18 @@
"description": "Configure the ANSI output.", "description": "Configure the ANSI output.",
"defaultValue": "detect" "defaultValue": "detect"
}, },
{
"name": "spring.pid.file",
"type": "java.lang.String",
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
},
{
"name": "spring.pid.fail-on-write-error",
"type": "java.lang.Boolean",
"description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
},
{ {
"name": "spring.profiles.active", "name": "spring.profiles.active",
"type": "java.util.List<java.lang.String>", "type": "java.util.List<java.lang.String>",