Skip to content

Commit

Permalink
Rename some daemons so that the naming is consistent with other daemons
Browse files Browse the repository at this point in the history
  • Loading branch information
marius committed Jun 15, 2011
1 parent 0068ed9 commit 5ced3ec
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion helper-scripts/passenger-spawn-server
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ OWNER_SOCKET_FD = 4
begin begin
STDOUT.sync = true STDOUT.sync = true
STDERR.sync = true STDERR.sync = true
$0 = "Passenger spawn server" $0 = "PassengerSpawnServer"
if GC.respond_to?(:copy_on_write_friendly=) if GC.respond_to?(:copy_on_write_friendly=)
GC.copy_on_write_friendly = true GC.copy_on_write_friendly = true
end end
Expand Down
2 changes: 1 addition & 1 deletion lib/phusion_passenger/classic_rails/application_spawner.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def before_fork # :nodoc:
# Overrided method. # Overrided method.
def initialize_server # :nodoc: def initialize_server # :nodoc:
report_app_init_status(MessageChannel.new(@owner_socket)) do report_app_init_status(MessageChannel.new(@owner_socket)) do
$0 = "Passenger ApplicationSpawner: #{@app_root}" $0 = "PassengerApplicationSpawner: #{@app_root}"
prepare_app_process('config/environment.rb', @options) prepare_app_process('config/environment.rb', @options)
if defined?(RAILS_ENV) if defined?(RAILS_ENV)
Object.send(:remove_const, :RAILS_ENV) Object.send(:remove_const, :RAILS_ENV)
Expand Down
2 changes: 1 addition & 1 deletion lib/phusion_passenger/classic_rails/framework_spawner.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def before_fork # :nodoc:


# Overrided method. # Overrided method.
def initialize_server # :nodoc: def initialize_server # :nodoc:
$0 = "Passenger FrameworkSpawner: #{@framework_version}" $0 = "PassengerFrameworkSpawner: #{@framework_version}"
@spawners = AbstractServerCollection.new @spawners = AbstractServerCollection.new
channel = MessageChannel.new(@owner_socket) channel = MessageChannel.new(@owner_socket)
begin begin
Expand Down
2 changes: 1 addition & 1 deletion lib/phusion_passenger/rack/application_spawner.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def before_fork # :nodoc:
# Overrided method. # Overrided method.
def initialize_server # :nodoc: def initialize_server # :nodoc:
report_app_init_status(MessageChannel.new(@owner_socket)) do report_app_init_status(MessageChannel.new(@owner_socket)) do
$0 = "Passenger ApplicationSpawner: #{@app_root}" $0 = "PassengerApplicationSpawner: #{@app_root}"
prepare_app_process('config.ru', @options) prepare_app_process('config.ru', @options)
@app = self.class.send(:load_rack_app) @app = self.class.send(:load_rack_app)
after_loading_app_code(@options) after_loading_app_code(@options)
Expand Down

0 comments on commit 5ced3ec

Please sign in to comment.