Please review pull request #664: Fix console logging for no-daemonize mode opened by (cprice-puppet)
Description:
A recent change to how we handle logging for master accidentally
broke console logging for no-daemonize mode. This change fixes it.
- Opened: Thu Apr 12 00:02:31 UTC 2012
- Based on: puppetlabs:master (42c8526aca72a4205358f8e8fdab20f48417106b)
- Requested merge: cprice-puppet:bug/master/fix-console-logging-for-no-daemonize (3eb45775e5266401d7ef6a55b486f410664cd0da)
Diff follows:
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index fd6269e..a0f7cab 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -139,7 +139,7 @@ def start
# our streams and become a "real" daemon process. This is in hopes of allowing
# errors to have the console available as a fallback for logging for as long as
# possible.
- close_streams
+ close_streams if Puppet[:daemonize]
# Finally, loop forever running events - or, at least, until we exit.
run_event_loop
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index a328a1b..f2ed829 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -110,7 +110,7 @@ def http_server_class
def start
create_pidfile
- close_streams
+ close_streams if Puppet[:daemonize]
listen
end
diff --git a/spec/unit/network/server_spec.rb b/spec/unit/network/server_spec.rb
index 0b9e73a..20c34da 100755
--- a/spec/unit/network/server_spec.rb
+++ b/spec/unit/network/server_spec.rb
@@ -10,6 +10,7 @@
Puppet.settings.stubs(:value).with(:servertype).returns(:suparserver)
Puppet.settings.stubs(:value).with(:bindaddress).returns("")
Puppet.settings.stubs(:value).with(:masterport).returns(8140)
+ Puppet.settings.stubs(:value).with(:daemonize).returns(true)
Puppet::Network::HTTP.stubs(:server_class_by_type).returns(@mock_http_server_class)
Puppet.settings.stubs(:value).with(:servertype).returns(:suparserver)
@server = Puppet::Network::Server.new(:port => 31337)
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
