emmy-engine 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa1990028500d30ba25d45be63ffcb856b5e9519
-  data.tar.gz: b7ff2fb12a960c81d683818ab97ef728a0c2e938
+  metadata.gz: 9b287cff45993922a60dd74dd1fe309d6683181b
+  data.tar.gz: 000276b49e6c8f1679ca5e20f8f55ce81a776703
 SHA512:
-  metadata.gz: e070764e6a01891301d125cdfdaf30e06d77680f2cbfd23d90d8c7445edf27ff9e62c4b24402865aa7abd59ece6fe758bebe17b79dca43f255af18af0c8d68ef
-  data.tar.gz: eb2fb3785e56a923693fba2e4568622fb1b361ca346f364d93fd314a72e91ad43d02d67b110bdcced22ca419fbdbb721649ed3447b02aeea4726c8edd9ca66ab
+  metadata.gz: e6ed1fd123c0676a7072cee623e0b1f1f4af8008999088501874ad18954318d9c7806588bbd795a57428d54a695fa95393465785fc7f000ff644bd1b3395810f
+  data.tar.gz: 4d8a2a6a5439d610bbe427eaa4e75866ec23ef71a8dfe34666aff4e27c8b3672ba93dff34908bf41e0128112ab70d1f6d15b2a9ac23ca8f3332f199eb3f28446

data/emmy-engine.gemspec

@@ -1,8 +1,8 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
 require 'emmy/version'
+
 version = File.read(File.expand_path('../../EMMY_VERSION', __FILE__)).strip
 if version != Emmy::VERSION
   puts "Different version numbers"

data/lib/emmy.rb

@@ -8,8 +8,15 @@ module Emmy
   include EventObject
   include Fibre::Synchrony
 
-  autoload :Http,   'emmy/http'
-  autoload :Runner, 'emmy/runner'
+  autoload :Http,    'emmy/http'
+  autoload :Backend, 'emmy/backend'
+  autoload :Runner,  'emmy/runner'
+
+  module_function
+
+  def env
+    Emmy::Runner.instance.config.environment
+  end
 end
 
 require 'emmy/version'

data/lib/emmy/backend.rb

@@ -0,0 +1,25 @@
+module Emmy
+  module Backend
+    extend EmmyMachine::ClassMethods
+    using Emmy
+
+    module_function
+
+    attr_reader :apps
+
+    def app(name: nil, &b)
+      @apps ||= {}
+      name ||= Emmy::Runner.instance.config.backend
+
+      if b
+        app = EmmyHttp::Application.new
+        app.instance_eval(&b)
+        @apps[name] = app
+      else
+        @apps[name]
+      end
+    end
+
+    #<<<
+  end
+end

data/lib/emmy/runner.rb

@@ -4,7 +4,7 @@ module Emmy
   class Runner
     include Singleton
     using EventObject
-    events :parse
+    events :init, :parse
 
     RUBY     = Gem.ruby
     BIN_EMMY = "bin/emmy"
@@ -33,6 +33,9 @@ module Emmy
       on :parse do
         update_rack_environment!
       end
+      on :init do
+        initialize!
+      end
     end
 
     def execute_bin_emmy
@@ -62,8 +65,8 @@ module Emmy
                                           "Default: #{config.url.host}")     { |address| config.url.host = address }
         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", "--silence",   "Logging disabled")              { config.logging = false }
+        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; }
         # actions
         opts.on("-i", "--info",      "Shows server configuration") { @action = :show_configuration }
         opts.on("-c", "--console",   "Start a console")            { @action = :start_console }
@@ -78,14 +81,23 @@ module Emmy
         config.group = "worker"
       end
 
-      config.pid  ||= "#{config.backend}.pid"
-      config.log  ||= "#{config.backend}.log"
       if config.environment == "development"
         config.stdout = "#{config.backend}.stdout"
         config.stderr = config.stdout
       end
     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"
+      end
+    end
+
     def run_action
       # Run parsers
       parse!
@@ -95,21 +107,48 @@ module Emmy
     end
 
     def daemonize_server
+      run_next_instance
+    end
+
+    def run_next_instance
+      if config.id >= config.servers
+        exit
+      end
+
       Process.fork do
         Process.setsid
-        exit if fork
+        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) # rw-rw-rw-
+          File.umask(0000)
           bind_standard_streams
-          start_server
+          run
         end
       end
     end
 
     def start_server
-      load backend_file
+      init.fire_for(self)
+      run
+    end
+
+    def run
+      Emmy.run do
+        trap("INT")  { Emmy.stop }
+        trap("TERM") { Emmy.stop }
+
+        Emmy.fiber_block do
+          Backend.module_eval(File.read(backend_file), backend_file)
+        end
+      end
     end
 
     def start_console
@@ -120,12 +159,13 @@ module Emmy
           require 'irb'
           require 'irb/completion'
 
-            IRB.start
+          IRB.start
         end
       end
     end
 
     def show_configuration
+      init.fire_for(self)
       puts "Server configuration:"
       config.attributes.each do |name, value|
         value = "off" if value.nil?
@@ -146,13 +186,17 @@ module Emmy
       exit
     end
 
+    def configure(&b)
+      on :init, &b
+    end
+
     private
 
     def backend_file
       thin = (config.backend == 'backend') ? EmmyExtends::Thin::EMMY_BACKEND : nil rescue nil
       backends = [
-        "#{Dir.getwd}/#{config.backend}.rb",
-        "#{Dir.getwd}/config/#{config.backend}.rb",
+        "#{Dir.getwd}/#{config.backend}.em",
+        "#{Dir.getwd}/config/#{config.backend}.em",
         thin
       ].compact
 
@@ -164,6 +208,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)
       File.open(config.pid, 'w') { |f| f.write(pid) }
       if block_given?
         yield pid
@@ -171,6 +216,18 @@ module Emmy
       end
     end
 
+    def stop_pid(pid)
+      unless pid.zero?
+        Process.kill("TERM", pid)
+        puts "Restarting..."
+        while File.exists?(config.pid)
+          sleep(0.1)
+        end
+        #Process.wait(pid)
+      end
+    rescue
+    end
+
     def delete_pid
       File.delete(config.pid)
     end

data/lib/emmy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-engine
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emmy-machine
@@ -124,6 +124,7 @@ files:
 - bin/emmy
 - emmy-engine.gemspec
 - lib/emmy.rb
+- lib/emmy/backend.rb
 - lib/emmy/http.rb
 - lib/emmy/runner.rb
 - lib/emmy/version.rb