Merge pull request #8196 from zhanhb:patch-1

* pr/8196:
  Polish pid metadata
  Fix pid properties link in documentation
This commit is contained in:
Stephane Nicoll 2017-02-05 09:25:25 +01:00
commit 21e866535c
4 changed files with 14 additions and 14 deletions

View File

@ -186,18 +186,6 @@
"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",
"type": "java.lang.String",

View File

@ -123,7 +123,7 @@ content into your application; rather pick only the properties that you need.
# 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.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).

View File

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

View File

@ -178,6 +178,18 @@
"description": "Configure the ANSI output.",
"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",
"type": "java.lang.String",