Added modifications to mongrel_service GemPlugin. Currently fails to stop the service (under investigation).

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@214 19e92222-5c0b-0410-8929-a290d50e31e9

projects/mongrel_service/Rakefile

@@ -19,8 +19,8 @@ version="0.1"
 name="mongrel_service"
 
 setup_gem(name, version) do |spec|
-  spec.summary = "Mongrel Native Win32 Service Plugin"
+  spec.summary = "Mongrel Native Win32 Service Plugin for Rails"
-  spec.description = "This plugin offer native win32 services for rails."
+  spec.description = "This plugin offer native win32 services for rails, powered by Mongrel."
   spec.author="Luis Lavena"
   
   # added mongrel_service executable

projects/mongrel_service/bin/mongrel_service

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'win32/service'
 require 'mongrel'
 require 'mongrel/rails'
@@ -41,107 +42,55 @@ module Kernel32
 end
 # End Kernel32 Module
 
-class RailsServer
+# RailsService code here
+class RailsService < Win32::Daemon
   def initialize(settings)
     @settings = settings
-  end # initialize
+  end
   
-  def configure
+  def service_init
-    STDERR.puts "** Configuring Rails Server"
     @config = Mongrel::Rails::RailsConfigurator.new(@settings) do
       log "Starting Mongrel in #{defaults[:environment]} mode at #{defaults[:host]}:#{defaults[:port]}"
-      
+
       listener do
         mime = {}
         if defaults[:mime_map]
           log "Loading additional MIME types from #{defaults[:mime_map]}"
           mime = load_mime_map(defaults[:mime_map], mime)
         end
-        
+
         if defaults[:debug]
           log "Installing debugging prefixed filters.  Look in log/mongrel_debug for the files."
           debug "/"
         end
-  
+
         log "Starting Rails in environment #{defaults[:environment]} ..."
-        uri "/", :handler => rails
+        uri "/", :handler => rails(:mime => mime)
         log "Rails loaded."
-  
+
-        #FIXME: We need to check why fail to load plugins.
         #log "Loading any Rails specific GemPlugins"
         #load_plugins
-  
+
         if defaults[:config_script]
           log "Loading #{defaults[:config_script]} external config script"
           run_config(defaults[:config_script])
         end
       end
     end
-    STDERR.puts "** Done with configuration"
-  end
-  
-  def start_serve
-    @runner = Thread.new do
-      STDERR.puts "** Configuration Thread suspended."
-      Thread.stop
-      
-      STDERR.puts "** Configuration Thread resumed, now joining..."
-      @config.join
-    end
 
-    STDERR.puts "** Start serving, config.run"
-    @config.run
-
-    STDERR.puts "** Running thread"
-    @runner.run
-  end
-  
-  def stop_serve
-    STDERR.puts "stop_serve entered"
-
-    if @runner.alive?
-      STDERR.puts "killing thread"
-      @runner.kill
-    end
-    
-    STDERR.puts "** Stoping Server"
-    @config.stop
-
-    STDERR.puts "stop_serve left"
-  end
-end
-
-# RailsService code here
-class RailsService < Win32::Daemon
-  def initialize(server)
-    @server = server
-  end
-  
-  def service_init
-    STDERR.puts "** Configuring server..."
-    
-    @server.configure
-
-    STDERR.puts "** Done Service_Init."
   end
   
   def service_main
-    STDERR.puts "** Start Serving "
+    @config.run
-    @server.start_serve
+    @config.log "Mongrel available at #{@settings[:host]}:#{@settings[:port]}"
 
-    STDERR.puts "Entering service_main loop"
     while state == RUNNING
       sleep 1
     end
 
-    @server.stop_serve
+		@config.stop
-    
-    STDERR.puts "leaving service_main."
   end
   
-  def service_stop
-    STDERR.puts "Stop signal received."
-  end
 end
 
 # default options
@@ -200,9 +149,5 @@ STDERR.sync = true
 #GemPlugin::Manager.instance.load "mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE
 
 # initialize the daemon and pass control to win32/service
-STDERR.puts "Initializing MongrelDaemon with OPTIONS"
+svc = RailsService.new(OPTIONS)
-server = RailsServer.new(OPTIONS)
-svc = RailsService.new(server)
 svc.mainloop
-#svc.service_init
-#svc.service_main

projects/mongrel_service/lib/mongrel_service/init.rb

@@ -5,17 +5,6 @@ require 'rbconfig'
 require 'win32/service'
 
 
-DEBUG_LOG_FILE = File.expand_path(File.dirname(__FILE__) + '/debug.log') 
-DEBUG_THREAD_LOG_FILE = File.expand_path(File.dirname(__FILE__) + '/debug_thread.log') 
-
-def dbg(msg)
-  File.open(DEBUG_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - #{msg}") }
-end
-  
-def dbg_th(msg)
-  File.open(DEBUG_THREAD_LOG_FILE,"a+") { |f| f.puts("#{Time.now} - #{msg}") }  
-end
-
 module Service
   class Install < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
@@ -103,10 +92,10 @@ module Service
       argv = []
       
       # ruby.exe instead of rubyw.exe due a exception raised when stoping the service!
-      argv << '"' + Config::CONFIG['bindir'] + '/ruby.exe' + '" '
+      argv << '"' + Config::CONFIG['bindir'] + '/ruby.exe' + '"'
       
       # add service_script, we now use the rubygem powered one
-      argv << '"' + Config::CONFIG['bindir'] + '/mongrel_service' + '" '
+      argv << '"' + Config::CONFIG['bindir'] + '/mongrel_service' + '"'
 
       # now the options
       argv << "-e #{@options[:environment]}" if @options[:environment]

projects/mongrel_service/tools/rakehelp.rb

@@ -93,7 +93,8 @@ def setup_gem(pkg_name, pkg_version)
     
   Rake::GemPackageTask.new(spec) do |p|
     p.gem_spec = spec
-    p.need_tar = true
+    # win32 chokes on this
+    p.need_tar = true if RUBY_PLATFORM !~ /mswin/
   end
 end