Changeset 404

Timestamp:

11/20/06 22:06:45 (2 years ago)

Author:

luislavena

Message:

Adjustments to Rakefile (win32 platform specific).
Disable process sharing for single service (taking in consideration addition of cluster).
Removed mongrel_service script from bin.

Files:

• branches/win32-native_service/projects/mongrel_service/Rakefile (modified) (2 diffs)
• branches/win32-native_service/projects/mongrel_service/bin/mongrel_service (deleted)
• branches/win32-native_service/projects/mongrel_service/lib/mongrel_service/init.rb (modified) (9 diffs)
• branches/win32-native_service/projects/mongrel_service/native/mongrel_service.bas (modified) (1 diff)

branches/win32-native_service/projects/mongrel_service/Rakefile

@@ -17 +17 @@
-task :default => [:test, :compile, :package]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-# ServiceFB namespace (lib)
@@ -93 +68 @@
-task :compile => "native:build"
-task :clobber => "native:clobber"
+
+
+setup_gem(GEM_NAME, GEM_VERSION) do |spec|
+  spec.summary = "Mongrel Native Win32 Service Plugin for Rails"
+  spec.description = "This plugin offer native win32 services for rails, powered by Mongrel."
+  spec.author = "Luis Lavena"
+  spec.platform = Gem::Platform::WIN32
+  
+  spec.files -= Dir["bin/**/*"]
+  spec.files -= Dir["**/*.{o,a}"]
+  spec.files += Dir["native/**/*.{bas,bi}"]
+  spec.files += ["bin/mongrel_service.exe"]
+  
+  spec.add_dependency('gem_plugin', '>= 0.2.1')
+  spec.add_dependency('mongrel', '>= 0.3.14')
+  spec.add_dependency('win32-service', '>= 0.5.0')
+  
+  spec.files += Dir.glob("resources/**/*")
+end
+
+task :install => [:test, :package] do
+  sh %{gem install pkg/#{name}-#{version}.gem}
+end
+
+task :uninstall => [:clean] do
+  sh %{gem uninstall #{name}}
+end
+

branches/win32-native_service/projects/mongrel_service/lib/mongrel_service/init.rb

@@ -4 +4 @@
-require 'rbconfig'
-require 'win32/service'
-
+
-
-module Service
@@ -27 +27 @@
-          ['-C', '--config PATH', "Use a config file", :@config_file, nil],
-          ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
-          ['-u', '--cpu CPU', "Bind the process to specific cpu, starting from 1.", :@cpu, nil],
-          ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil]
-        ]
@@ -44 +43 @@
-      # start with the premise of app really exist.
-      app_exist = true
-db log public
+log
-        if !File.directory?(File.join(@cwd, path))
-          app_exist = false
@@ -61 +60 @@
-      valid_exists? @config_file, "Config file not there: #@config_file" if @config_file
-
-      # Validate the number of cpu to bind to.
-      valid? @cpu.to_i > 0, "You must specify a numeric value for cpu. (1..8)" if @cpu
-      
-      # We should validate service existance here, right Zed?
-      begin
@@ -79 +75 @@
-    
-    def run
+      # check if mongrel_service.exe is in ruby bindir.
+      gem_root = File.join(File.dirname(__FILE__), "..", "..")
+      gem_executable = File.join(gem_root, "bin/mongrel_service.exe")
+      bindir_executable = File.join(Config::CONFIG['bindir'], '/mongrel_service.exe')
+      
+      unless File.exist?(bindir_executable)
+        STDERR.puts "** Copying native mongrel_service executable..."
+        FileUtils.cp gem_executable, bindir_executable rescue nil
+      end
+      
+      unless FileUtils.compare_file(bindir_executable, gem_executable)
+        STDERR.puts "** Updating native mongrel_service executable..."
+        FileUtils.rm_f bindir_executable rescue nil
+        FileUtils.cp gem_executable, bindir_executable rescue nil
+      end
+      
+      # build the command line
+      argv = []
+      
+      # start using the native executable
+      argv << '"' + bindir_executable + '"'
+      
+      # use the 'single' service for now
+      argv << "single"
+      
-      # command line setting override config file settings
-      @options = { :host => @address,  :port => @port, :cwd => @cwd,
@@ -85 +106 @@
-        :debug => @debug, :includes => ["mongrel"], :config_script => @config_script,
-        :num_procs => @num_procs, :timeout => @timeout, :cpu => @cpu, :prefix => @prefix
+      }
+      
+      # if we are using a config file, pass -c and -C to the service instead of each start parameter.
+      if @config_file
+        STDERR.puts "** Using #{@config_file} instead of command line parameters."
+        conf = YAML.load_file(@config_file)
+        
+        # add the root folder (-c)
+        argv << "-c \"#{conf[:cwd]}\""
+        
+        # use the config file
+        argv << "-C \"#{@config_file}\""
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-
-      argv = []
-      
-      # ruby.exe instead of rubyw.exe due a exception raised when stoping the service!
-      argv << '"' + Config::CONFIG['bindir'] + '/ruby.exe' + '"'
-      
-      # add service_script, we now use the rubygem powered one
-      argv << '"' + Config::CONFIG['bindir'] + '/mongrel_service' + '"'
-
-      # now the options
-      argv << "-e #{@options[:environment]}" if @options[:environment]
-      argv << "-p #{@options[:port]}"
-      argv << "-a #{@options[:host]}"  if @options[:host]
-      argv << "-l \"#{@options[:log_file]}\"" if @options[:log_file]
-      argv << "-P \"#{@options[:pid_file]}\""
-      argv << "-c \"#{@options[:cwd]}\"" if @options[:cwd]
-      argv << "-t #{@options[:timeout]}" if @options[:timeout]
-      argv << "-m \"#{@options[:mime_map]}\"" if @options[:mime_map]
-      argv << "-r \"#{@options[:docroot]}\"" if @options[:docroot]
-      argv << "-n #{@options[:num_procs]}" if @options[:num_procs]
-      argv << "-B" if @options[:debug]
-      argv << "-S \"#{@options[:config_script]}\"" if @options[:config_script]
-      argv << "-u #{@options[:cpu.to_i]}" if @options[:cpu]
-      argv << "--prefix \"#{@options[:prefix]}\"" if @options[:prefix]
-
-      svc = Win32::Service.new
@@ -125 +145 @@
-          s.binary_path_name = argv.join ' '
-          s.dependencies     = []
+          s.service_type     = Win32::Service::WIN32_OWN_PROCESS
-        }
-        puts "Mongrel service '#{@svc_display}' installed as '#{@svc_name}'."
@@ -148 +169 @@
-      begin
-        valid? Win32::Service.exists?(@svc_name), "There is no service with that name, cannot proceed."
+        Win32::Service.open(@svc_name) do |svc|
+          valid? svc.binary_path_name.include?("mongrel_service"), "The service specified isn't a Mongrel service."
+        end
-      rescue
-      end
@@ -173 +197 @@
-    end
-  end
-
-  class Start < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
-    include ServiceValidation
-    
-    def run
-      display_name = Win32::Service.getdisplayname(@svc_name)
-  
-      begin
-        Win32::Service.start(@svc_name)
-        started = false
-        while started == false
-          s = Win32::Service.status(@svc_name)
-          started = true if s.current_state == "running"
-          break if started == true
-          puts "One moment, " + s.current_state
-          sleep 1
-        end
-        puts "#{display_name} service started"
-      rescue Win32::ServiceError => err
-        puts "There was a problem starting the service:"
-        puts err
-      end
-    end
-  end
-
-  class Stop < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
-    include ServiceValidation
-    
-    def run
-      display_name = Win32::Service.getdisplayname(@svc_name)
-  
-      begin
-        Win32::Service.stop(@svc_name)
-        stopped = false
-        while stopped == false
-          s = Win32::Service.status(@svc_name)
-          stopped = true if s.current_state == "stopped"
-          break if stopped == true
-          puts "One moment, " + s.current_state
-          sleep 1
-        end
-        puts "#{display_name} service stopped"
-      rescue Win32::ServiceError => err
-        puts "There was a problem stopping the service:"
-        puts err
-      end
-    end
-  end
-end

branches/win32-native_service/projects/mongrel_service/native/mongrel_service.bas

@@ -31 +31 @@
-            .name = "single"
-            .description = "Mongrel Single Process service"
+            
+            '# disabling shared process
+            .shared_process = FALSE
-            
-            '# TODO: fix inheritance here