simonmenke-shuttle 0.1.08 → 0.1.09

data/lib/shuttle.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 
+autoload :URI,         'uri'
 autoload :Etc,         'etc'
 autoload :DRb,         'drb'
 autoload :TSort,       'tsort'
@@ -15,6 +16,7 @@ module Shuttle
   autoload :Server,           (base+'/shuttle/server')
   autoload :Client,           (base+'/shuttle/client')
   autoload :System,           (base+'/shuttle/system')
+  autoload :Daemon,           (base+'/shuttle/daemon')
   autoload :JobQueue,         (base+'/shuttle/job_queue')
   autoload :Satellite,        (base+'/shuttle/satellite')
   autoload :AppRunner,        (base+'/shuttle/app_runner')
@@ -50,7 +52,6 @@ module Shuttle
   
   THOR_VERSION          = '>= 0.9.9'
   RUBIGEN_VERSION       = '>= 1.5.2'
-  SIMPLE_DEAMON_VERSION = '>= 0.1.2'
   
   Shuttle::ExceptionHandler.setup
   extend ExceptionHandler

data/lib/shuttle/apps/server.rb

@@ -8,7 +8,6 @@ module Shuttle
       desc "start", 'start the server'
       method_options :foreground => :boolean,  :config => :optional
       def start
-        Shuttle.runtime_gem('simple-daemon', Shuttle::SIMPLE_DEAMON_VERSION)
         Shuttle.server? true
         Shuttle::System.load!(options[:root_path])
         
@@ -24,11 +23,9 @@ module Shuttle
           exit(1)
         end
         
-        SimpleDaemon.const_set 'WORKING_DIRECTORY', Shuttle.system.root
         if options[:foreground]
           Shuttle::Server.start
         else
-          ARGV.clear and ARGV.concat(%w( start ))
           Shuttle::Server.daemonize
         end
       end

data/lib/shuttle/daemon.rb

@@ -0,0 +1,71 @@
+
+module Shuttle
+  module Daemon
+    class Base
+      
+      def self.daemonize(&block)
+        Shuttle::Daemon::Controller.start(self,&block)
+      end
+      
+    end
+  
+    module PidFile
+      def self.store(pid)
+        File.open(self.pid_file, 'w') {|f| f << pid}
+      end
+  
+      def self.recall
+        IO.read(self.pid_file).to_i rescue nil
+      end
+      
+      def self.destroy
+        FileUtils.rm(self.pid_file) if self.exist?
+      end
+      
+      def self.pid_file
+        Shuttle.system.path("Server.pid")
+      end
+      
+      def self.exist?
+        File.file?(self.pid_file)
+      end
+    end
+  
+    module Controller
+      
+      def self.start(daemon, &block)
+        fork do
+          Process.setsid
+          exit if fork
+          if PidFile.exist?
+            puts "Pid file #{PidFile.pid_file} already exists. Not starting."
+            exit 1
+          end
+          Shuttle::Daemon::PidFile.store(Process.pid)
+          Dir.chdir Shuttle.system.root
+          File.umask 0000
+          
+          Shuttle::ExceptionHandler.redirect_std
+          
+          trap("TERM") { daemon.stop; exit }
+          at_exit { Shuttle::Daemon::PidFile.destroy if $master }
+          at_exit(&block) if block
+          daemon.start
+        end
+        puts "Daemon started."
+      end
+      
+      def self.stop
+        if !Shuttle::Daemon::PidFile.exist?
+          puts "Pid file not found. Is the daemon started?"
+          exit
+        end
+        pid = Shuttle::Daemon::PidFile.recall
+        pid && Process.kill("TERM", pid)
+      rescue Errno::ESRCH
+        puts "Pid file found, but process was not running. The daemon may have died."
+      end
+      
+    end
+  end
+end

data/lib/shuttle/exception_handler.rb

@@ -4,15 +4,21 @@ module Shuttle
     
     def self.setup(out=STDOUT, err=STDERR)
       if String === out
-        @out = Logger.new(out, 'daily')
+        @out    = Logger.new(out, 'daily')
+        @stdout = @out.instance_variable_get('@logdev').instance_variable_get('@dev')
       else
-        @out = Logger.new(out)
+        @out    = Logger.new(out)
+        @stdout = out
       end
+      
       if String === err
         @err = Logger.new(err, 'daily')
+        @stderr = @err.instance_variable_get('@logdev').instance_variable_get('@dev')
       else
-        @err = Logger.new(err)
+        @err    = Logger.new(err)
+        @stderr = err
       end
+      
       @out.level = Logger::DEBUG
       @err.level = Logger::DEBUG
     end
@@ -25,6 +31,26 @@ module Shuttle
       @out
     end
     
+    def self.stderr
+      @stderr
+    end
+    
+    def self.stdout
+      @stdout
+    end
+    
+    def self.redirect_std
+      if STDOUT != self.stdout
+        STDOUT.reopen self.stdout
+      end
+      
+      if STDERR != self.stderr
+        STDERR.reopen self.stderr
+      end
+      
+      STDIN.reopen "/dev/null"
+    end
+    
     def logger
       Shuttle::ExceptionHandler
     end

data/lib/shuttle/server.rb

@@ -1,9 +1,8 @@
-Shuttle.runtime_gem('simple-daemon', Shuttle::SIMPLE_DEAMON_VERSION)
 
 module Shuttle
   
   # the Server is supposed to be a simple DRb interface to the System.
-  class Server < SimpleDaemon::Base
+  class Server < Shuttle::Daemon::Base
     include DRbUndumped
     
     autoload :Proxy,    File.dirname(__FILE__)+'/server/proxy'
@@ -23,17 +22,20 @@ module Shuttle
     
     def stop_server
       Shuttle.log "stopping the server..."
-      Thread.new { sleep(1) and exit(Shuttle::STOP_STATUS) }
+      $exitstatus = Shuttle::STOP_STATUS
+      DRb.stop_service
     end
     
     def restart_server
       Shuttle.log "restarting the server..."
-      Thread.new { sleep(1) and exit(Shuttle::RESTART_STATUS) }
+      $exitstatus = Shuttle::RESTART_STATUS
+      DRb.stop_service
     end
     
     def reload_server
       Shuttle.log "reloading the server..."
-      Thread.new { sleep(1) and exit(Shuttle::RELOAD_STATUS) }
+      $exitstatus = Shuttle::RELOAD_STATUS
+      DRb.stop_service
     end
     
     def server_version

data/lib/shuttle/server/daemon.rb

@@ -1,4 +1,3 @@
-require 'uri'
 
 module Shuttle
   class Server
@@ -19,7 +18,7 @@ module Shuttle
           uri.to_s
         end
         
-        # stop teh server
+        # stop the server
         def stop
           Shuttle.client.stop_server
         end
@@ -31,6 +30,7 @@ module Shuttle
         
         # start the failsafe runner.
         def start_with_failsafe
+          $master = true
           stop_server = false
           wait_before_start = 0
           retries = 0
@@ -41,6 +41,7 @@ module Shuttle
             end
             
             pid = Process.fork { self.run_server }
+            return unless pid
             Process.waitpid(pid, 0)
             case $?.exitstatus
             when Shuttle::STOP_STATUS
@@ -52,19 +53,18 @@ module Shuttle
             when Shuttle::RELOAD_STATUS
               stop_server = true
               retries     = 0
-              Shuttle.system.run(%{sleep 2 ; #{Shuttle::BIN_PATH} #{ORIGINAL_ARGV.join(' ')}})
+              Shuttle::Daemon::PidFile.destroy
+              Shuttle.system.run %{#{Shuttle::BIN_PATH} #{ORIGINAL_ARGV.join(' ')}}
             else
               retries += 1
               stop_server = true if retries >= 3
             end
           end
-          
-          path = Shuttle.system.path('Server.pid')
-          File.unlink(path) if File.file?(path)
         end
         
         # start the actual DRb server
         def run_server
+          $master = false
           Dir.chdir(Shuttle.system.root)
           
           Shuttle.log "Server started"
@@ -74,13 +74,12 @@ module Shuttle
           make_client_cert_public!
           
           at_exit do
-            unless $task_child
-              Shuttle.system.queue.stop!
-              Shuttle.log "Server stopped"
-            end
+            Shuttle.system.queue.stop!
+            Shuttle.log "Server stopped"
           end
           
           DRb.thread.join
+          exit($exitstatus || Shuttle::STOP_STATUS)
         end
         
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simonmenke-shuttle
 version: !ruby/object:Gem::Version 
-  version: 0.1.08
+  version: 0.1.09
 platform: ruby
 authors: 
 - Simon Menke
@@ -42,6 +42,7 @@ files:
 - lib/shuttle/apps/server.rb
 - lib/shuttle/client/auth_token.rb
 - lib/shuttle/client.rb
+- lib/shuttle/daemon.rb
 - lib/shuttle/exception_handler.rb
 - lib/shuttle/extentions/rubygems_plugin.rb
 - lib/shuttle/extentions/thor_extentions.rb