spider-gazelle 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06ce9d0c2e12d8dda15fd597dbba9026d8848520
-  data.tar.gz: 3c649fbf8734a3f73e50073d3cf83efdc590e2a6
+  metadata.gz: 637abdac912362192fa95d5ac953e859c856c0b6
+  data.tar.gz: 0c56ae0b98de48a37cb2b66c55d9e42d1085454d
 SHA512:
-  metadata.gz: 438f525a31e89401f9c86dd57c50a97c3a558eca28e04dc82e1173cd9af801e3de899282f55a387fccbc2ff2d13b0da5ca74645320edc8fc2a0c4fb7b0756d32
-  data.tar.gz: 4a52edec124cb480ab4c51a9c584923529045f51007ee3213ef58a77669896ef51569d461ffd9d8e12e10148106fb80305bd4f8395e65d2a908771cfef5f88dd
+  metadata.gz: 658c6babb2b9f7e46ca956d966bf661ac8eed64867c04e6e3f63482f612d58b18284a9a1ae7d1eb1fa776badba5775adbbba3deb6d791d1466b72bbf8a99522f
+  data.tar.gz: 1af8beea242d2137379dd96547d14acea49e937a941f1be6f506fc6691afb992fdd71a465ff35bd88a8ea8043c9219e4230d5063b1d3773e77f99d9e7c2203c5

data/bin/sg

@@ -34,10 +34,14 @@ parser = OptionParser.new do |opts|
         options[:rackup] = arg
     end
 
-    opts.on "-l", "--logfile FILE", "Location of the servers log file (default: logs/server.log)" do |arg|
+    opts.on "-l", "--log FILE", "Location of the servers log file (default: logs/server.log)" do |arg|
         ENV['SG_LOG'] = arg
     end
 
+    opts.on "-P", "--pid FILE", "Location of the servers pid file (default: tmp/pids/sg-PORT.pid)" do |arg|
+        ENV['SG_PID'] = arg
+    end
+
     opts.on "-m", "--mode MODE", "Either thread, process or no_ipc (default: thread)" do |arg|
         ENV['SG_MODE'] = arg
     end

data/lib/spider-gazelle.rb

@@ -7,6 +7,8 @@ require "spider-gazelle/request"        # Holds request information and handles
 require "spider-gazelle/connection"     # Holds connection information and handles request pipelining
 require "spider-gazelle/gazelle"        # Processes data received from connections
 
+require "spider-gazelle/management/process" # Processes data received from connections
+
 require "spider-gazelle/app_store"      # Holds references to the loaded rack applications
 require "spider-gazelle/binding"        # Holds a reference to a bound port and associated rack application
 require "spider-gazelle/spider"         # Accepts connections and offloads them to gazelles

data/lib/spider-gazelle/const.rb

@@ -27,7 +27,7 @@ module SpiderGazelle
   # REMOTE_USER, or REMOTE_HOST parameters since those are either a security problem or
   # too taxing on performance.
   module Const
-    SPIDER_GAZELLE_VERSION = VERSION = "1.0.1".freeze
+    SPIDER_GAZELLE_VERSION = VERSION = "1.0.2".freeze
     # CODE_NAME = "Earl of Sandwich Partition"
     SERVER = "SpiderGazelle".freeze
 

data/lib/spider-gazelle/management/process.rb

@@ -0,0 +1,90 @@
+
+if ::FFI::Platform.windows?
+  begin
+    require 'win32/process'
+  rescue LoadError
+    puts "Warning: The win32-process gem is required for PID file use on Windows. Install the gem (in your Gemfile if using bundler) to avoid errors."
+  end
+end
+
+module SpiderGazelle
+  class PidFileExists < RuntimeError; end
+
+  module Management
+    class Pid
+      def initialize(path)
+        @pid_file = path
+
+        remove_stale_pid_file
+        write_pid_file
+
+        # At application exit remove the file
+        #  unless of course we do not own the file
+        cur = ::Process.pid
+        at_exit do
+          if cur == current
+            remove_pid_file
+          end
+        end
+      end
+      
+      def current
+        File.exist?(@pid_file) ? open(@pid_file).read.to_i : nil
+      end
+
+      def running?(pid)
+        if ::FFI::Platform.windows?
+          begin
+            # Returns exit code or nil if still running
+            if ::Process.respond_to? :get_exitcode
+              return ::Process.get_exitcode(pid).nil?
+            else
+              # win32/process not loaded
+              return false
+            end
+          rescue
+            # PID probably doesn't exist
+            false
+          end
+        else
+          begin
+            ::Process.getpgid(pid) != -1
+          rescue ::Errno::EPERM
+            # Operation not permitted
+            true
+          rescue ::Errno::ESRCH
+            # No such process
+            false
+          end
+        end
+      end
+
+      protected
+
+
+      def remove_stale_pid_file
+        if File.exist?(@pid_file)
+          pid = current
+
+          if pid && running?(pid)
+            raise PidFileExists, "#{@pid_file} already exists, seems like it's already running (process ID: #{pid}). " +
+                                 "Stop the process or delete #{@pid_file}."
+          else
+            remove_pid_file
+          end
+        end
+      end
+
+      def write_pid_file
+        File.open(@pid_file, 'w') do |f|
+          f.write ::Process.pid
+        end
+        File.chmod(0644, @pid_file)
+      end
+
+      def remove_pid_file
+        File.delete(@pid_file) if @pid_file && File.exists?(@pid_file)
+      end
+    end
+  end
+end

data/lib/spider-gazelle/spider.rb

@@ -70,12 +70,18 @@ module SpiderGazelle
       @delegate = method(no_ipc? ? :direct_delegate : :delegate)
       @squash = method(:squash)
 
-      # FIXME The expanded path path seems a bit risky
-      log_path = ENV['SG_LOG'] || File.expand_path('../../../logs/server.log', __FILE__)
+      log_path = ENV['SG_LOG'] || File.expand_path('log/sg.log', Dir.pwd)
       dirname = File.dirname(log_path)
       FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
       @logger = ::Logger.new(log_path.to_s, 10, 4194304)
 
+      # Create the PID file
+      pid_path = ENV['SG_PID'] || File.expand_path('tmp/pids/sg.pid', Dir.pwd)
+      dirname = File.dirname(pid_path)
+      FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+      @pid = Management::Pid.new(pid_path)
+
+
       # Keep track of the loading process
       @waiting_gazelle = 0
       @gazelle_count = 0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spider-gazelle
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,6 +155,7 @@ files:
 - lib/spider-gazelle/connection.rb
 - lib/spider-gazelle/const.rb
 - lib/spider-gazelle/gazelle.rb
+- lib/spider-gazelle/management/process.rb
 - lib/spider-gazelle/request.rb
 - lib/spider-gazelle/spider.rb
 - lib/spider-gazelle/upgrades/websocket.rb
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A fast, parallel and concurrent web server for ruby