nitro 0.31.0 → 0.40.0

data/lib/nitro/server/drb.rb

@@ -2,6 +2,7 @@
 
 require 'drb'
 require 'optparse'
+require 'fileutils'
 
 require 'facet/synchash'
 
@@ -80,12 +81,26 @@ class DrbServer
   end
 
   # Start the DRb server.
-    
+  #--
+  # TODO: refactor with runner code.
+  #++
+      
   def start
     parse_options
+
     if @daemon
       require 'daemons/daemonize'
+      pwd = Dir.pwd
+
       Daemonize.daemonize()
+
+      # Restore the original pwd (daemonize sets the 
+      # pwd to '/').
+
+      Dir.chdir(pwd)
+
+      # Save a process sentinel file.    
+      FileUtils.touch ".d#{Process.pid}.pid"
     end
     setup_drb()
   end
@@ -103,4 +118,3 @@ DrbServer.start if __FILE__ == $0
 
 end
 
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/server/runner.rb

@@ -15,41 +15,14 @@ module Nitro
 # The runner provides default parsing of command line
 # and environment parameters. 
 #
-# The default execution modes are:
-#
-# :debug, :stage, :live
-#
 # You can implement your own, custom version of the Runner
 # to run your custom web applications.
 #--
-# FIXME: Rename/Reimplement this class.
+# WARNING: this class will be deprecated!
+# FIXME: Trim this class, most functionality goes to bin/nitro.
 #++
 
 class Runner
-
-  # The adapter used.
-  
-  setting :adapter, :default => :webrick, :doc => 'The web adapter'
-  
-  # Execution mode = (:debug, :stage, :live) 
-  #
-  # [:debug]
-  #    useful when debugging, extra debug information
-  #    is emmited, actions, templates and shaders are
-  #    reloaded, etc. The execution speed of the application
-  #    is impaired.
-  #
-  # [:stage]
-  #    test the application with live parameters 
-  #    (typically on a staging server).
-  #
-  #  [:live]
-  #    use the parameters for the live (production)
-  #    server. Optimized for speed.
-  #
-  # The default mode is :debug
-
-  setting :mode, :default => :debug, :doc => 'The execution mode'
           
   # :start, :stop, :restart
 
@@ -76,18 +49,9 @@ class Runner
   
   def setup_options
     @action ||= :start
-    @server ||= :webrick
     @daemon = false
     @spider = false
 
-    # Setup from environment
-
-    if mode = ENV['NITRO_MODE']
-      self.class.mode = mode.to_sym
-    else
-      self.class.mode ||= :debug
-    end
-
     # Setup from command line arguments.
     
     parser = OptionParser.new do |opts|
@@ -113,15 +77,15 @@ class Runner
       end
       
       opts.on('-D', '--debug', 'Run application in debug mode.') do
-        self.class.mode = :debug
+        Configuration.mode = :debug
       end
 
       opts.on('-T', '--stage', 'Run application in stage mode.') do
-        self.class.mode = :stage
+        Configuration.mode = :stage
       end
 
       opts.on('-L', '--live', 'Run application in live mode.') do
-        self.class.mode = :live
+        Configuration.mode = :live
       end
 
       opts.on('--address IP', 'Force the server to run on this address.') do |a|
@@ -132,83 +96,96 @@ class Runner
         @server_port = p.to_i
       end
 
+      opts.on('--port_offset PORT', 'The port offset in the cluster.') do |o|
+        @server_port_offset = o.to_i
+      end
+
       opts.on('-w', '--webrick', 'Use a webrick server [default].') do
-        @server = :webrick
+        Nitro.adapter = :webrick
       end
 
       opts.on('-m', '--mongrel', 'Use the Mongrel Ruby server.') do
-        @server = :mongrel
+        Nitro.adapter = :mongrel
         # FIXME: handle logging.
       end
 
       opts.on('-l', '--lhttpd', 'Use a lighttpd server (FastCGI).') do
-        @server = :lhttpd
+        Nitro.adapter = :lhttpd
         Logger.set(Logger.new('log/app.log'))
       end
 
       opts.on('-l', '--lhttpd-scgi', 'Use the SCGI adapter (Lighttpd).') do
-        @server = :lhttpd_scgi
+        Nitro.adapter = :lhttpd_scgi
         Logger.set(Logger.new('log/app.log'))
       end
 
       opts.on('-a', '--apache', 'Use an apache server.') do
-        @server = :apache
+        Nitro.adapter = :apache
         Logger.set(Logger.new('log/app.log'))
       end
 
       opts.on('--apache-cgi', 'Use the CGI adapter (Apache)') do
-        @server = :cgi
+        Nitro.adapter = :cgi
         Logger.set(Logger.new('log/app.log'))
       end
 
       opts.on('--scgi', 'Use the generic SCGI adapter') do
-        @server = :scgi
+        Nitro.adapter = :scgi
       end
       
-      opts.on('-C', '--console', 'Start a console attached to an instance of the application.') do
-        if RUBY_PLATFORM =~ /mswin32/
-          irb_name = 'irb.bat'
-        else
-          irb_name = 'irb'
-        end
-        ENV['NITRO_INVOKE'] = 'irb'
-        $NITRO_NO_INVOKE = true
-        @server = :console
-        conf_file = File.basename(caller.last.split(':').first)
-        exec "#{irb_name} -r #{conf_file} -r irb/completion --noinspect"
-        exit
-      end
-
       opts.on('--crawl', 'Crawl the application.') do
-        @server = :webrick
+        Nitro.adapter = :webrick
         @spider = :crawl
       end
 
       opts.on('--render', 'Crawl the application and render all pages as static html files.') do
-        @server = :webrick
+        Nitro.adapter = :webrick
         @spider = :render
       end
 
-      opts.on('--record FILENAME', 'Record the application server session to the given file.') do |filename|
-        @server = :webrick
-        $record_session_filename = filename || 'vcrsession.yaml'
+      opts.on_tail('-h', '--help', 'Show this message.') do
+        puts opts
+        exit
       end
+    
+      # Hack fix for bin/nitro.
 
-      opts.on('--playback FILENAME', 'Playback a previously recorded session from the given file.') do |filename|
-        @server = :webrick
-        $playback_session_filename = filename || 'vcrsession.yaml'
+      opts.on_tail('-v', '--verbose', 'Verbose mode') do 
+        # nop, hack fix.
       end
 
-      opts.on_tail('-v', '--version', 'Show version.') do 
-        puts "Nitro #{Nitro::Version}"
-        exit
+      opts.on('--destroy') do
+        # nop, hack fix.
+      end      
+
+      opts.on('-C', '--console', 'Start a console attached to an instance of the application.') do
+        # nop, hack fix.
       end
 
-      opts.on_tail('-h', '--help', 'Show this message.') do
-        puts opts
-        exit
+      opts.on('--app', 'The application name') do |adapter|
+        # nop, hack fix.
       end
-      
+
+      opts.on('--mode', 'Set the execution mode') do |adapter|
+        # nop, hack fix.
+      end
+
+      opts.on('--adapter', 'Set the adapter to use') do |adapter|
+        # nop, hack fix.
+      end
+
+      opts.on('--record', 'Record the application server session to the given file.') do |filename|
+        # nop, hack fix.
+      end
+
+      opts.on('--playback', 'Playback a previously recorded session from the given file.') do |filename|
+        # nop, hack fix.
+      end
+
+      opts.on('--cluster', 'Setup a cluster.') do |ic|
+        # nop, hack fix.
+      end
+
     end
 
     parser.parse!(ARGV)
@@ -220,7 +197,7 @@ class Runner
   # using the passed configuration parameters.
   
   def setup_mode
-    case self.class.mode
+    case Configuration.mode
       when :debug
         setup_debug
 
@@ -249,7 +226,7 @@ class Runner
     autoreload(3)
     Caching.caching_enabled = false
     
-    load_external_configuration(:debug)
+#    load_external_configuration(:debug)
   end
 
   def setup_stage
@@ -258,7 +235,7 @@ class Runner
     autoreload(3)    
     Logger.set(Logger.new('log/app.log'))
     
-    load_external_configuration(:stage)    
+#    load_external_configuration(:stage)    
   end
 
   def setup_live
@@ -273,8 +250,8 @@ class Runner
     autoreload(2 * 60)    
     Logger.set(Logger.new('log/app.log'))
     
-    load_external_configuration(:live)        
-    load_external_configuration(:production)        
+#    load_external_configuration(:live)        
+#    load_external_configuration(:production)        
   end
   alias_method :setup_production, :setup_live
 
@@ -296,8 +273,10 @@ class Runner
       
     when 'irb'
       require 'nitro/adapter/console'
+      require 'nitro/caching/proxy'
       $server = server
       $app = ConsoleAdapter.new(server)
+      $cache = Caching::Proxy
       
     else
       invoke_server(server)
@@ -312,6 +291,7 @@ class Runner
     # FIXME refactor !
     server.address = @server_address if @server_address
     server.port = @server_port if @server_port
+    server.port += @server_port_offset if @server_port_offset
     
     case @action
     when :start
@@ -329,22 +309,24 @@ class Runner
           end 
       end
 
-      @server ||= Runner.adapter
+      @server = Nitro.adapter
 
-      puts "\n==> Setup for #{self.class.mode} mode"
+      Logger.info ""
+      Logger.info "Setup for #{Configuration.mode} mode."
 
       case @server
         when :webrick
           require 'nitro/adapter/webrick'
-          puts "==> Listening at #{server.address}:#{server.port}. [WEBRICK]"
-          puts "==> Press Ctrl-C to shutdown; Run with --help for options.\n\n"    
+          Logger.info "Starting Webrick on #{server.address}:#{server.port}"
+          Logger.info "Press Ctrl-C to shutdown; Run with --help for options."
+          Logger.info ""      
           Webrick.start(server)
 
         when :mongrel
           require 'nitro/adapter/mongrel'
-          puts "==> Listening at #{server.address}:#{server.port}. [MONGREL]"
-          puts "==> Press Ctrl-C to shutdown; Run with --help for options.\n\n"
-
+          Logger.info "Starting Mongrel on #{server.address}:#{server.port}"
+          Logger.info "Press Ctrl-C to shutdown; Run with --help for options."
+          Logger.info ""      
           Mongrel.start(server)
 
         when :lhttpd
@@ -352,11 +334,6 @@ class Runner
           puts "==> Launching lighttpd (FastCGI)."
           `lighttpd -f conf/lhttpd_fcgi.conf`
 
-        when :lhttpd_scgi
-          require 'nitro/adapter/scgi'
-          puts "==> Launching lighttpd (SCGI)."
-          `lighttpd -f conf/lhttpd_scgi.conf`
-
         when :apache
           require 'nitro/adapter/fastcgi'
           puts "==> Launching apache (FastCGI)."
@@ -366,11 +343,6 @@ class Runner
           require 'nitro/adapter/cgi'
           puts "==> Using standard CGI. Please look into using Fast/Scgi"
 
-
-        when :scgi
-          require 'nitro/adapter/scgi'
-          SCGI.start(server)
-        
       end
       
     when :stop
@@ -394,13 +366,22 @@ class Runner
   
   def daemonize
     require 'daemons/daemonize'
+
     pwd = Dir.pwd
     Daemonize.daemonize(File.join(pwd, 'log/app.log'))
+
     # Restore the original pwd (daemonize sets the 
     # pwd to '/').
+
     Dir.chdir(pwd)
+
+    # Save a process sentinel file.
+    
+    FileUtils.touch ".a#{Process.pid}.pid"
+    
     # Set the logger to a file (daemonize closes the
     # std streams).
+
     Logger.set(Logger.new('log/app.log'))
   end
 
@@ -429,6 +410,3 @@ end
 Run = Runner
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * James Britt <james_b@neurogami.com>

data/lib/nitro/service.rb

@@ -22,4 +22,3 @@ end
 
 end
 
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/service/xmlrpc.rb

@@ -39,5 +39,3 @@ class XmlRpcService < Service
 end
   
 end
-
-# * George Moschovitis <gm@navel.gr>

data/lib/nitro/session.rb

@@ -55,28 +55,39 @@ class Session < Hash
   
   setting :keepalive, :default => 30.minutes, :doc => 'The session keepalive time'
 
+  # The type of the session cache. The generalized caching 
+  # system in Glue is used. The following options are available:
+  #
+  # * :memory [default]
+  # * :drb
+  # * :og 
+  # * :file
+  # * :memcached
+
+  setting :cache_type, :default => :memory, :doc => 'The type of session cache'
+
+  # The address of the cache store.
+  
+  setting :cache_address, :default => '127.0.0.1', :doc => 'The address of the cache store'
+
+  # The port of the cache store.
+  
+  setting :cache_port, :default => 9069, :doc => 'The port of the cache store'
+
   class << self
 
     # The sessions cache (store). 
 
     attr_accessor :cache
-  
-    # Set the session cache. The generalized caching system in
-    # Glue is used. The following options are available:
-    #
-    # * :memory [default]
-    # * :drb
-    # * :og 
-    # * :file
-    # * :memcached
-
-    def cache_type=(cache_type)
+    alias store cache
+    
+    # Load the correct Session specialization according to the
+    # cache type.
+
+    def setup(type = Session.cache_type)
       # gmosx: RDoc friendly. 
-      require 'nitro/session/' + cache_type.to_s
+      require 'nitro/session/' + type.to_s
     end
-    alias_method :set_cache_type, :cache_type=
-    alias_method :store_type=, :cache_type=
-    alias_method :set_store_type, :cache_type=
 
     # Lookup the session in the cache by using the session
     # cookie value as a key. If the session does not exist
@@ -188,6 +199,3 @@ protected
 end
 
 end
-
-# * George Moschovitis <gm@navel.gr>
-# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>