pastry 0.1.0 → 0.1.1

data/bin/pastry

@@ -16,10 +16,17 @@ parser  = OptionParser.new do |opts|
   opts.on('-d', '--[no-]daemon',      'daemonize')        {|value| options[:daemonize]  = value }
   opts.on('-l', '--logfile file',     'logfile')          {|value| options[:logfile]    = value }
   opts.on('-P', '--pidfile file',     'pidfile')          {|value| options[:pidfile]    = value }
+  opts.on('-c', '--connections num',  'max connections')  {|value| options[:maxconn]    = value }
+  opts.on('-t', '--timeout secs',     'read timeout')     {|value| options[:timeout]    = value }
+  opts.on('-A', '--application name', 'app name')         {|value| options[:name]       = value }
 end
 
 parser.parse!
 
+%w(workers port maxconn timeout).map(&:to_sym).each do |name|
+  options[name] = options[name].to_i if options.key?(name)
+end
+
 app  = Rack::Builder.parse_file(options.delete(:rackup) || 'config.ru').first
 size = options.delete(:workers) || 2
 env  = options.delete(:env)     || 'development'

data/lib/pastry.rb

@@ -10,18 +10,29 @@ class Pastry
     @pool    = pool
     @app     = app
     @host    = options.fetch :host,       '127.0.0.1'
-    @port    = options.fetch :port,       3000
     @unix    = options.fetch :socket,     nil
-    @queue   = options.fetch :queue,      1024
     @logfile = options.fetch :logfile,    nil
     @daemon  = options.fetch :daemonize,  false
     @pidfile = options.fetch :pidfile,    '/tmp/pastry.pid'
-    # TODO: validation
+    @name    = options.fetch :name,       nil
+
+    @port    = options.fetch(:port,    3000).to_i
+    @queue   = options.fetch(:queue,   1024).to_i
+    @maxconn = options.fetch(:maxconn, 1024).to_i
+    @timeout = options.fetch(:timeout,   30).to_i
   end
 
   def start
     ensure_not_running!
     Process.daemon if daemon
+
+    if daemon || logfile
+      STDOUT.reopen(logfile || '/tmp/pastry.log', 'a')
+      STDERR.reopen(logfile || '/tmp/pastry.log', 'a')
+      STDOUT.sync = true
+      STDERR.sync = true
+    end
+
     start!
   end
 
@@ -37,8 +48,12 @@ class Pastry
     File.open(pidfile, 'w') {|fh| fh.write(Process.pid)}
   end
 
+  def name
+    '%s master' % (@name || 'pastry')
+  end
+
   def motd
-    "starting #{@app} pastry with #{pool} flakes listening on #{unix ? 'socket %s ' % unix : 'port %d' % port}"
+    "starting #{name} with #{pool} minions listening on #{unix ? 'socket %s ' % unix : 'port %d' % port}"
   end
 
   def start!
@@ -51,39 +66,45 @@ class Pastry
     server.listen(@queue)
     server.extend(PastryServer)
 
-    @running   = true
     server.app = @app
-    logger     = Logger.new(logfile || daemon ? '/tmp/pastry.log' : $stdout, 0)
-    pids       = pool.times.map { run(server) }
+    logger     = Logger.new(logfile || (daemon ? '/tmp/pastry.log' : $stdout), 0)
+    options    = {timeout: @timeout, maximum_connections: @maxconn}
 
     logger.info motd
+
+    $0         = name if @name
+    @running   = true
+    pids       = pool.times.map {|n| run(server, options, n) }
+
     Signal.trap('CHLD') do
-      unless @running
+      if @running
         died  = pids.reject {|pid| Process.kill(0, pid) rescue nil}
-        pids -= died
         died.each do |pid|
           logger.info "process #{pid} died, starting a new one"
-          pids << run(server)
+          idx       = pids.index(pid)
+          pids[idx] = run(server, options, idx)
         end
       end
     end
 
-    at_exit { FileUtils.rm_f(pidfile) }
-
     %w(INT TERM HUP).each do |signal|
       Signal.trap(signal) do
         @running = false
         logger.info "caught #{signal}, closing time for the bakery -- no more pastries!"
-        pids.each {|pid| Process.kill(signal, pid) }
+        pids.each {|pid| Process.kill(signal, pid) rescue nil}
         exit
       end
     end
 
+    at_exit { FileUtils.rm_f(pidfile); FileUtils.rm_f(unix.to_s) }
     Process.waitall rescue nil
   end
 
-  def run server
-    fork { EM.run { Backend.new.start(server) } }
+  def run server, options, worker
+    fork do
+      $0 = "#{@name ? "%s worker" % @name : "pastry chef"} #{worker} (started: #{Time.now})"
+      EM.run { Backend.new(options).start(server) }
+    end
   end
 
   module PastryServer
@@ -91,6 +112,11 @@ class Pastry
   end
 
   class Backend < Thin::Backends::Base
+    def initialize options = {}
+      super()
+      options.each {|key, value| send("#{key}=", value)}
+    end
+
     def start server
       @stopping = false
       @running  = true
@@ -103,9 +129,7 @@ class Pastry
     end
 
     def trap_signals!
-      %w(INT TERM HUP CHLD).each do |signal|
-        Signal.trap(signal) { exit }
-      end
+      %w(INT TERM HUP CHLD).each {|signal| Signal.trap(signal) { exit }}
     end
   end # Backend
 end # Pastry

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bharanee Rathna