Skip to content

Commit d20e5db

Browse files
committed
Print "Running via Spring preloader" message to stderr
Not stdout; stdout is for the output of the actual command being run, stderr is for extra messages/warnings like this.
1 parent 0a80019 commit d20e5db

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* Fix problems with the implementation of the new "Running via Spring preloader"
44
message (see #456, #457)
5+
* Print "Running via Spring preloader" message to stderr, not stdout
56

67
## 1.6.1
78

lib/spring/application.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def serve(client)
157157
IGNORE_SIGNALS.each { |sig| trap(sig, "DEFAULT") }
158158
trap("TERM", "DEFAULT")
159159

160-
puts "Running via Spring preloader in process #{Process.pid}" unless Spring.quiet
160+
STDERR.puts "Running via Spring preloader in process #{Process.pid}" unless Spring.quiet
161161

162162
ARGV.replace(args)
163163
$0 = command.exec_name

lib/spring/test/acceptance_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,14 @@ def without_gem(name)
103103
end
104104

105105
test "tells the user that spring is being used when used automatically via binstubs" do
106-
assert_success "bin/rails runner ''", stdout: "Running via Spring preloader in process"
107-
assert_success app.spring_test_command, stdout: "Running via Spring preloader in process"
106+
assert_success "bin/rails runner ''", stderr: "Running via Spring preloader in process"
107+
assert_success app.spring_test_command, stderr: "Running via Spring preloader in process"
108108
end
109109

110110
test "does not tell the user that spring is being used when used automatically via binstubs but quiet is enabled" do
111111
File.write("#{app.user_home}/.spring.rb", "Spring.quiet = true")
112112
assert_success "bin/rails runner ''"
113-
refute_output_includes "bin/rails runner ''", stdout: 'Running via Spring preloader in process'
113+
refute_output_includes "bin/rails runner ''", stderr: 'Running via Spring preloader in process'
114114
end
115115

116116
test "test changes are picked up" do

0 commit comments

Comments
 (0)