emmy-engine 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb59578321a7548dfbfb97f3aec79be5fa4748d4
-  data.tar.gz: 6956f77fa81364267887394db94e96a81315178c
+  metadata.gz: 2ca6fbf6bf4fe55da6118207a8364f8e7c9e3e6e
+  data.tar.gz: 7ac4430acd303c198bb530719da1cc1731422079
 SHA512:
-  metadata.gz: 3a561103f57d1797a6e91e7deb4cf255ed99ab771ff55797cca9353393fb8afbdceba608c9f33eedfc0452c9656a7fd6d9c32e48f4479b0d72315e6928d05f5a
-  data.tar.gz: c56a4fddb13fe885d462d22a98ee702940b6b3e8cfe521eed86b6795da420af967119e6d2f573aee808473a0007c9c90cf2bba2aaaea01b4fe00ef15a43b014c
+  metadata.gz: dd9eb63595163b681075ab2b70acedd73ceddb639cb5562373a3c9707881b33d6e127849268ac1173174fdcc4f4c01b3384dbc104fe7f2f35b4a0c41cf752c21
+  data.tar.gz: 26223b0c416dd7bf78522aa8ae2e4c4fb9a9549b0d99b1d2c7be2626604621ed9b05b9f362aeaa14888a8e9a27dab4386b0b22d0697da259d24c9da43a97d778

data/lib/emmy/runner.rb

@@ -60,7 +60,7 @@ 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") { config.daemonize = true }
+        opts.on("-d", "--daemonize", "Runs server in the background") { @action = :daemonize_server }
         opts.on("-s", "--silence",   "Logging disabled")              { config.logging = false }
         # actions
         opts.on("-i", "--info",      "Shows server configuration") { @action = :show_configuration }
@@ -76,7 +76,12 @@ module Emmy
         config.group = "worker"
       end
 
-      config.pid ||= "tmp/pids/#{config.backend}.pid"
+      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 run_action
@@ -87,6 +92,20 @@ module Emmy
       self
     end
 
+    def daemonize_server
+      Process.fork do
+        Process.setsid
+        exit if fork
+
+        scope_pid(Process.pid) do |pid|
+          puts pid
+          File.umask(0000) # rw-rw-rw-
+          bind_standard_streams
+          start_server
+        end
+      end
+    end
+
     def start_server
       load backend_file
     end
@@ -97,7 +116,9 @@ module Emmy
       else
         require 'irb'
         require 'irb/completion'
-        IRB.start
+        EmmyMachine.run_block do
+          IRB.start
+        end
       end
     end
 
@@ -138,6 +159,30 @@ module Emmy
       error "Can't find backend in #{backends.inspect} places."
     end
 
+    def scope_pid(pid)
+      FileUtils.mkdir_p(File.dirname(config.pid))
+      File.open(config.pid, 'w') { |f| f.write(pid) }
+      if block_given?
+        yield pid
+        delete_pid
+      end
+    end
+
+    def delete_pid
+      File.delete(config.pid)
+    end
+
+    def bind_standard_streams
+      STDIN.reopen("/dev/null")
+      STDOUT.reopen(config.stdout, "a")
+
+      if config.stdout == config.stderr
+        STDERR.reopen(STDOUT)
+      else
+        STDERR.reopen(config.stderr, "a")
+      end
+    end
+
     #<<<
   end
 end

data/lib/emmy/version.rb

@@ -1,3 +1,3 @@
 module Emmy
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

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