rack-server_status 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 554f891d0e1c84390b17194e10b8b4e01ff44aa3
-  data.tar.gz: 3ae424f2f2c13263efffffd814580962f3c21fc6
+SHA256:
+  metadata.gz: 37148a09571f8aaeaa6375977c39ce033bac533b6f35179e7073f78fd60ab934
+  data.tar.gz: bb2bd52467f2bf3cc3d7bc3c21c3ef31b3387ee944ebc93c86d6b470964a89c0
 SHA512:
-  metadata.gz: f15b30d6879bc0fb12607309ce8f622cc0bfd2cea8e1bf3190f47eeabcf05e8fc33117184f44e55805d5083db912484162f60ab8c5121a5ae3ae809ade208d5e
-  data.tar.gz: 5ba77936259052892a0febf154e442b0f59e362223c60e0d5813fa8c40087864f548fc2850517846e41a3182fa192bdc824060b646e3cdf5634ef185c5e7b43b
+  metadata.gz: 17d6cd6ec1c13bbd8338a1174ff5b338d7cb32a53c9112623963497bb4fc3110f6ce6475bae5e80de9ea1e832fcb0fd6c3f60ca0ba20d8972f497f555c71a348
+  data.tar.gz: 2b58d0c8dc3f6e24d38d7563921f6b1029fb7986dbff0303be1da0a5375afd9df9edafb3110627aa272491cb7401634ab4fa33cb40514aadac40fa15d549277b

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.1
   - 2.2
+  - 2.3
+  - 2.4
+  - 2.5

data/README.md

@@ -19,8 +19,51 @@ Or install it yourself as:
     $ gem install rack-server_status
 
 ## Usage
+### Getting started
+Tell your app to use the Rack::ServerStatus middleware.
+
+#### For Rails 3+ apps
+
+```
+# In config/application.rb
+config.middleware.use Rack::ServerStatus, scoreboard_path: './tmp'
+```
+
+#### Rackup files
+
+```
+# In config.ru
+use Rack::ServerStatus, scoreboard_path: './tmp'
+```
+
+### Get Status
+
+```
+% curl http://server:port/server-status
+Uptime: 1432227723 (12 seconds)
+BusyWorkers: 1
+IdleWorkers: 3
+--
+pid status remote_addr host method uri protocol ss
+55091 _  -    0
+55092 _  -    1
+55093 A 127.0.0.1 localhost:3000 GET /server-status HTTP/1.1 0
+55094 _  -    0
+
+# JSON format
+% curl http://server:port/server-status?json
+{"Uptime":1432388968,"BusyWorkers":1,"IdleWorkers":3,"stats":[{"remote_addr":null,"host":"-","method":null,"uri":null,"protocol":null,"pid":87240,"status":"_","ss":2},{"remote_addr":"127.0.0.1","host":"localhost:3000","method":"GET","uri":"/server-status?json","protocol":"HTTP/1.1","pid":87241,"status":"A","ss":0},{"remote_addr":null,"host":"-","method":null,"uri":null,"protocol":null,"pid":87242,"status":"_","ss":3},{"remote_addr":null,"host":"-","method":null,"uri":null,"protocol":null,"pid":87243,"status":"_","ss":3}]}
+```
+
+## Configuration
+
+| name | detail | example | default |
+|------|--------|---------|---------|
+| path | location that displays server status | `path: '/server-status'` | `/server-status` |
+| allow | host based access control of a page of server status. | `allow: ['127.0.0.1']` | `[]` |
+| scoreboard | scoreboard directory | `scoreboard_path: './tmp'` | nil |
+| skip_ps_command |  | `skip_ps_command: true` | false |
 
-TODO: Write usage instructions here
 
 ## Contributing
 

data/examples/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 gem 'unicorn'
-#gem 'worker_scoreboard', git: 'https://github.com/SpringMT/worker_scoreboard.git'
-gem 'worker_scoreboard', path: '/Users/haruyama.makoto/worker_scoreboard'
+gem 'worker_scoreboard', git: 'https://github.com/SpringMT/worker_scoreboard.git'
 gem 'parallel'

data/examples/Gemfile.lock

@@ -1,7 +1,8 @@
-PATH
-  remote: /Users/haruyama.makoto/worker_scoreboard
+GIT
+  remote: https://github.com/SpringMT/worker_scoreboard.git
+  revision: 949d7a98b4044f26b9de864a64eb6cc790cab1ba
   specs:
-    worker_scoreboard (0.0.2)
+    worker_scoreboard (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/rack/server_status.rb

@@ -19,18 +19,13 @@ module Rack
     def call(env)
       set_state!('A', env)
 
-      @clean_proc = Remover.new
-      ObjectSpace.define_finalizer(self, @clean_proc)
-
-      if @path && env['PATH_INFO'] == @path
-        res = handle_server_status(env)
-        set_state!('_')
-        return res
+      if env['PATH_INFO'] == @path
+        handle_server_status(env)
+      else
+        @app.call(env)
       end
-
-      res = @app.call(env)
+    ensure
       set_state!('_')
-      return res
     end
 
     private
@@ -132,15 +127,5 @@ EOF
       end
       return [200, {'Content-Type' => 'text/plain'}, [body]]
     end
-
-    class Remover
-      def initialize
-      end
-      def call(*args)
-        set_state!('_')
-      end
-    end
-
   end
-
 end

data/lib/rack/server_status/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ServerStatus
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-server_status
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - SpringMT
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worker_scoreboard
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '2.0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Show server status
@@ -123,4 +123,3 @@ test_files:
 - examples/unicorn.rb
 - spec/server_status_spec.rb
 - spec/spec_helper.rb
-has_rdoc: