lib/flapjack/cli/server.rb in flapjack-1.2.1rc2 vs lib/flapjack/cli/server.rb in flapjack-1.2.1rc3
- old
+ new
@@ -46,13 +46,19 @@
def start
if runner.daemon_running?
puts "Flapjack is already running."
else
print "Flapjack starting..."
- print "\n" unless @options[:daemonize]
+ main_umask = nil
+ if @options[:daemonize]
+ main_umask = File.umask
+ else
+ print "\n"
+ end
return_value = nil
runner.execute(:daemonize => @options[:daemonize]) {
+ File.umask(main_umask) if @options[:daemonize]
return_value = start_server
}
puts " done."
exit_now!(return_value) unless return_value.nil?
end
@@ -80,10 +86,13 @@
exit_now! "Failed to stop Flapjack #{pid}" unless wait_pid_gone(pid)
@runner = nil
print "Flapjack starting..."
+
+ main_umask = File.umask
runner.execute(:daemonize => true) {
+ File.umask(main_umask)
start_server
}
puts " done."
end