Ticket #5004: lighttpd.rb.diff

railties/lib/commands/servers/lighttpd.rb

@@ -1 +1 @@
-require 'rbconfig'
-
-unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank?
-  puts "PROBLEM: Lighttpd is not available on your system (or not in your path)"
-  exit 1
-end
-
-unless defined?(FCGI)
-  puts "PROBLEM: Lighttpd requires that the FCGI Ruby bindings are installed on the system"
-  exit 1
-end
-
-require 'initializer'
-configuration = Rails::Initializer.run(:initialize_logger).configuration
-default_config_file = config_file = Pathname.new("#{RAILS_ROOT}/config/lighttpd.conf").cleanpath
@@ -18 +8 @@
-
-detach = false
-
+lighttpd_modules = ''
+lighttpd_executable = 'lighttpd'
+
-ARGV.options do |opt|
-  opt.on('-c', "--config=#{config_file}", 'Specify a different lighttpd config file.') { |path| config_file = path }
-  opt.on('-h', '--help', 'Show this message.') { puts opt; exit 0 }
-  opt.on('-d', '-d', 'Call with -d to detach') { detach = true; puts "=> Configuration in config/lighttpd.conf" }
+  opt.on('-l', "--lighttpd_modules=path", 'Path to lighttpd modules (e.g. /opt/lightty/lib)') { |lighttpd_modules| }
+  opt.on('-e', "--lighttpd=path", 'Path to lighttpd executable (e.g. /opt/lightty/bin)') do |path|
+    lighttpd_executable = File.join(path, lighttpd_executable)
+  end
-  opt.parse!
-end
-
+unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `#{lighttpd_executable} -version` }.blank?
+  puts "PROBLEM: Lighttpd is not available on your system (or not in your path)"
+  exit 1
+end
+
+unless defined?(FCGI)
+  puts "PROBLEM: Lighttpd requires that the FCGI Ruby bindings are installed on the system"
+  exit 1
+end
+
-unless File.exist?(config_file)
-  if config_file != default_config_file
-    puts "=> #{config_file} not found."
@@ -75 +82 @@
-
-begin
-  `rake tmp:sockets:clear` # Needed if lighttpd crashes or otherwise leaves FCGI sockets around
-lighttpd
+#{lighttpd_executable} #{lighttpd_modules ? "-m #{lighttpd_modules}" : ""}
-ensure
-  unless detach
-    tail_thread.kill if tail_thread