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
5c11059e
Commit
5c11059e
authored
Oct 27, 2016
by
Christian Koops
Committed by
Andy Wilkinson
Nov 22, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make launch script's logFilename and pidFilename configurable via properties
Closes gh-7234
parent
09a235b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
3 deletions
+19
-3
deployment.adoc
spring-boot-docs/src/main/asciidoc/deployment.adoc
+7
-0
launch.script
...urces/org/springframework/boot/loader/tools/launch.script
+2
-3
DefaultLaunchScriptTests.java
...framework/boot/loader/tools/DefaultLaunchScriptTests.java
+10
-0
No files found.
spring-boot-docs/src/main/asciidoc/deployment.adoc
View file @
5c11059e
...
...
@@ -617,9 +617,16 @@ for Gradle and to `${project.name}` for Maven.
|`logFolder`
|The default value for `LOG_FOLDER`. Only valid for an `init.d` service.
|`logFilename`
|The default value for `LOG_FILENAME`. Only valid for an `init.d` service.
|`pidFolder`
|The default value for `PID_FOLDER`. Only valid for an `init.d` service.
|`pidFilename`
|The default value for the name of the pid file in `PID_FOLDER`. Only valid for an
`init.d` service.
|`useStartStopDaemon`
|If the `start-stop-daemon` command, when it's available, should be used to control the
process. Defaults to `true`.
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
View file @
5c11059e
...
...
@@ -71,8 +71,7 @@ if [[ -z "$identity" ]]; then
fi
# Initialize log file name if not provided by the config file
[[
-z
"
$LOG_FILENAME
"
]]
&&
LOG_FILENAME
=
"
${
identity
}
.log"
[[
-z
"
$LOG_FILENAME
"
]]
&&
LOG_FILENAME
=
"{{logFilename:
${
identity
}
.log}}"
# ANSI Colors
echoRed
()
{
echo
$'
\e
[0;31m'
"
$1
"
$'
\e
[0m'
;
}
...
...
@@ -114,7 +113,7 @@ if [[ "$identity" == "$init_script" ]] || [[ "$identity" == "$APP_NAME" ]]; then
PID_FOLDER
=
"
$PID_FOLDER
/
${
identity
}
"
pid_subfolder
=
$PID_FOLDER
fi
pid_file
=
"
$PID_FOLDER
/
${
identity
}
.pid
"
pid_file
=
"
$PID_FOLDER
/
{{pidFilename:
${
identity
}
.pid}}
"
log_file
=
"
$LOG_FOLDER
/
$LOG_FILENAME
"
# Determine the user to run as if we are root
...
...
spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
View file @
5c11059e
...
...
@@ -46,6 +46,16 @@ public class DefaultLaunchScriptTests {
assertThat
(
content
).
contains
(
"Spring Boot Startup Script"
);
}
@Test
public
void
logFilenameCanBeReplaced
()
throws
Exception
{
assertThatPlaceholderCanBeReplaced
(
"logFilename"
);
}
@Test
public
void
pidFilenameCanBeReplaced
()
throws
Exception
{
assertThatPlaceholderCanBeReplaced
(
"pidFilename"
);
}
@Test
public
void
initInfoProvidesCanBeReplaced
()
throws
Exception
{
assertThatPlaceholderCanBeReplaced
(
"initInfoProvides"
);
...
...
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