emmy-engine 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b287cff45993922a60dd74dd1fe309d6683181b
-  data.tar.gz: 000276b49e6c8f1679ca5e20f8f55ce81a776703
+  metadata.gz: 7de6c9da1251c209b2a72734a97f4f2e6714ab77
+  data.tar.gz: d232969593cd5abf02d31fc18755d8243e9e4208
 SHA512:
-  metadata.gz: e6ed1fd123c0676a7072cee623e0b1f1f4af8008999088501874ad18954318d9c7806588bbd795a57428d54a695fa95393465785fc7f000ff644bd1b3395810f
-  data.tar.gz: 4d8a2a6a5439d610bbe427eaa4e75866ec23ef71a8dfe34666aff4e27c8b3672ba93dff34908bf41e0128112ab70d1f6d15b2a9ac23ca8f3332f199eb3f28446
+  metadata.gz: 507fdcd91c0488c3f02ee06a6cfc64039e2f704cdb2708ed3767cba1f54dd40620a2ef20924e7c58aee8c56ddbe4e3eab9acb2032947ebd29550c91ed83ba154
+  data.tar.gz: c4c7f93925386fe5cc74108b2ac8e3d6265c3f9c2bf89c5018285239bf1ca9dc0f2eb2e8020a3563be1e6689c1cbd19dd106fe2e3113fc1e66d6a275ecffb03b

data/lib/emmy.rb

@@ -15,7 +15,11 @@ module Emmy
   module_function
 
   def env
-    Emmy::Runner.instance.config.environment
+    env.config.environment
+  end
+
+  def runner
+    Emmy::Runner.instance
   end
 end
 

data/lib/emmy/runner.rb

@@ -4,7 +4,7 @@ module Emmy
   class Runner
     include Singleton
     using EventObject
-    events :init, :parse
+    events :bootstrap, :instance
 
     RUBY     = Gem.ruby
     BIN_EMMY = "bin/emmy"
@@ -21,20 +21,20 @@ module Emmy
       @config = EmmyHttp::Configuration.new
       @action = :start_server
 
-      on :parse do
+      on :bootstrap do
         parse_environment!
       end
-      on :parse do
+      on :bootstrap do
         option_parser.parse!(argv)
       end
-      on :parse do
+      on :bootstrap do
         defaults!
       end
-      on :parse do
+      on :bootstrap do
         update_rack_environment!
       end
-      on :init do
-        initialize!
+      on :instance do |id|
+        instance_defaults!(id)
       end
     end
 
@@ -66,10 +66,20 @@ module Emmy
         opts.on("-b", "--backend NAME",   "Backend name",
                                           "Default: backend")         { |name| config.backend = name }
         opts.on("-d", "--daemonize",   "Runs server in the background") { @action = :daemonize_server }
-        opts.on("-s", "--servers NUM", "Number of servers to start")    { |num| @action = :daemonize_server; config.servers = num.to_i; }
+        opts.on("-s", "--servers NUM", "Number of servers to start") do |num|
+          @action = :daemonize_server if @action == :start_server
+          config.servers = num.to_i
+        end
+        opts.on('', '--id NUM',    "Server identifier")   { |id| config.id = id.to_i }
+        #opts.on('-l', '--log FILE',    "Log to file")   { |file| config.log    = file }
+        #opts.on('-o', '--output FILE', "Logs stdout to file") { |file| config.stdout = config.stderr = file }
+        #opts.on('-P', '--pid FILE',    "Pid file")      { |file| config.pid    = file }
+
         # actions
+        opts.separator "Actions:"
         opts.on("-i", "--info",      "Shows server configuration") { @action = :show_configuration }
         opts.on("-c", "--console",   "Start a console")            { @action = :start_console }
+        opts.on('-t', '--stop',      "Terminate background server") { @action = :stop_server }
         opts.on("-h", "--help",      "Display this help message")  { @action = :display_help }
         opts.on("-v", "--version",   "Display Emmy version.")      { @action = :display_version }
       end
@@ -85,62 +95,49 @@ module Emmy
         config.stdout = "#{config.backend}.stdout"
         config.stderr = config.stdout
       end
+
+      config.pid = "#{config.backend}.pid"
+      config.log = "#{config.backend}.log"
     end
 
-    def initialize!
-      if config.servers > 1
-        config.url.port += config.id
-        config.pid   = "#{config.backend}#{config.id}.pid"
-        config.log   = "#{config.backend}#{config.id}.log"
-      else
-        config.pid   = "#{config.backend}.pid"
-        config.log   = "#{config.backend}.log"
+    def instance_defaults!(id)
+      if config.id
+        config.url.port += id if config.servers
+        config.pid  = "#{config.backend}#{id}.pid"
+        config.log  = "#{config.backend}#{id}.log"
       end
     end
 
     def run_action
-      # Run parsers
-      parse!
+      # Bootstrap
+      bootstrap!
       # start action
       send(action)
       self
     end
 
     def daemonize_server
-      run_next_instance
-    end
-
-    def run_next_instance
-      if config.id >= config.servers
-        exit
-      end
-
-      Process.fork do
-        Process.setsid
-        if fork
-          config.id += 1
-          run_next_instance
-        end
-
-        Fibre.reset
-        # can load configuration
-        init.fire_for(self)
-
-        scope_pid(Process.pid) do |pid|
-          puts pid
-          File.umask(0000)
-          bind_standard_streams
-          run
+      each_server do
+        Process.fork do
+          Process.setsid
+          exit if fork
+
+          Fibre.reset
+          # Boot instance
+          instance!
+
+          scope_pid(Process.pid) do |pid|
+            puts pid
+            File.umask(0000)
+            bind_standard_streams
+            start_server
+          end
         end
       end
+      sleep(1)
     end
 
     def start_server
-      init.fire_for(self)
-      run
-    end
-
-    def run
       Emmy.run do
         trap("INT")  { Emmy.stop }
         trap("TERM") { Emmy.stop }
@@ -151,6 +148,13 @@ module Emmy
       end
     end
 
+    def stop_server
+      each_server do
+        instance!
+        stop_pid(config.pid)
+      end
+    end
+
     def start_console
       EmmyMachine.run_block do
         if defined?(binding.pry)
@@ -165,7 +169,6 @@ module Emmy
     end
 
     def show_configuration
-      init.fire_for(self)
       puts "Server configuration:"
       config.attributes.each do |name, value|
         value = "off" if value.nil?
@@ -187,11 +190,35 @@ module Emmy
     end
 
     def configure(&b)
-      on :init, &b
+      on :bootstrap, &b
+    end
+
+    def each(&b)
+      on :instance, &b
+    end
+
+    def bootstrap!
+      bootstrap.fire_for(self)
+    end
+
+    def instance!
+      instance.fire_for(self, config.id)
     end
 
     private
 
+    def each_server
+      unless config.servers
+        yield
+        return
+      end
+
+      config.servers.times do |id|
+        config.id = id
+        yield
+      end
+    end
+
     def backend_file
       thin = (config.backend == 'backend') ? EmmyExtends::Thin::EMMY_BACKEND : nil rescue nil
       backends = [
@@ -208,7 +235,7 @@ module Emmy
 
     def scope_pid(pid)
       FileUtils.mkdir_p(File.dirname(config.pid))
-      stop_pid(File.read(config.pid).to_i) if File.exists?(config.pid)
+      stop_pid(config.pid)
       File.open(config.pid, 'w') { |f| f.write(pid) }
       if block_given?
         yield pid
@@ -216,16 +243,19 @@ module Emmy
       end
     end
 
-    def stop_pid(pid)
+    def stop_pid(pid_file)
+      return unless File.exists?(pid_file)
+
+      pid = File.read(pid_file).to_i
       unless pid.zero?
         Process.kill("TERM", pid)
-        puts "Restarting..."
+        puts "Stopping..."
         while File.exists?(config.pid)
           sleep(0.1)
         end
         #Process.wait(pid)
       end
-    rescue
+    rescue Errno::ESRCH
     end
 
     def delete_pid

data/lib/emmy/version.rb

@@ -1,3 +1,3 @@
 module Emmy
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine