Skip to content

Commit 21e8665

Browse files
committed
Merge pull request #8196 from zhanhb:patch-1
* pr/8196: Polish pid metadata Fix pid properties link in documentation
2 parents 2f50d51 + a30461c commit 21e8665

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,18 +186,6 @@
186186
"replacement": "spring.info.git.location"
187187
}
188188
},
189-
{
190-
"name": "spring.pid.file",
191-
"type": "java.lang.String",
192-
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
193-
"sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
194-
},
195-
{
196-
"name": "spring.pid.fail-on-write-error",
197-
"type": "java.lang.Boolean",
198-
"description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
199-
"sourceType": "org.springframework.boot.actuate.system.ApplicationPidFileWriter"
200-
},
201189
{
202190
"name": "spring.pidfile",
203191
"type": "java.lang.String",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ content into your application; rather pick only the properties that you need.
123123
# OUTPUT
124124
spring.output.ansi.enabled=detect # Configure the ANSI output.
125125
126-
# PID FILE ({sc-spring-boot-actuator}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
126+
# PID FILE ({sc-spring-boot}/system/ApplicationPidFileWriter.{sc-ext}[ApplicationPidFileWriter])
127127
spring.pid.fail-on-write-error= # Fail if ApplicationPidFileWriter is used but it cannot write the PID file.
128128
spring.pid.file= # Location of the PID file to write (if ApplicationPidFileWriter is used).
129129

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ writes a PID file. Example:
14881488
[indent=0]
14891489
----
14901490
org.springframework.context.ApplicationListener=\
1491-
org.springframework.boot.actuate.system.ApplicationPidFileWriter,\
1491+
org.springframework.boot.system.ApplicationPidFileWriter,\
14921492
org.springframework.boot.actuate.system.EmbeddedServerPortFileWriter
14931493
----
14941494

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,18 @@
178178
"description": "Configure the ANSI output.",
179179
"defaultValue": "detect"
180180
},
181+
{
182+
"name": "spring.pid.file",
183+
"type": "java.lang.String",
184+
"description": "Location of the PID file to write (if ApplicationPidFileWriter is used).",
185+
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
186+
},
187+
{
188+
"name": "spring.pid.fail-on-write-error",
189+
"type": "java.lang.Boolean",
190+
"description": "Fail if ApplicationPidFileWriter is used but it cannot write the PID file.",
191+
"sourceType": "org.springframework.boot.system.ApplicationPidFileWriter"
192+
},
181193
{
182194
"name": "spring.profiles.active",
183195
"type": "java.lang.String",

0 commit comments

Comments
 (0)