prometheus-client-mmap 0.7.0.beta16 → 0.7.0.beta17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 123eb98e1cef887c18bd5c2d33b3979361456ebb
-  data.tar.gz: bd48325e2f9e2c71d25b694156e0275e8d369132
+  metadata.gz: a830232952d5753fc160f570cc962602f35b219b
+  data.tar.gz: 33183db099150ced78e22ff071cbde0730a1f993
 SHA512:
-  metadata.gz: 0210d8bf50f8e5ec6befc59e5b8e1b9ef4915af1941a1ac6601356e1274988fc6f3e49702fbec457ac625c4f8cb5923dbb0b3bbc30fc41f1732eb90cb308e34f
-  data.tar.gz: 42efaed06ef0ed251786949510451dbb5b58e7a4f5590431481ff44958e078c811058538dd4d03714cc0f61ecb7cc26223ceaa9f54cb1a587a8c3f67f98d214f
+  metadata.gz: f2f6b8fba44ce2760d0dd44a271718024b622cb21387590316c2de0590b895d4ce120c86b2e98ada39ceb2e3c3eb7fccacc96ceeb867ab21de4364e5db92faaa
+  data.tar.gz: c024e67d7f75e52a45b00791a481bb2ee5f99aa5f4b52b73b27f4e57ee54ae25cae35e3f6c6ebab84ceb4da0532cbddf921f551f18e5161489e483659e8df70c

data/lib/prometheus/client/helper/mmaped_file.rb

@@ -5,6 +5,46 @@ module Prometheus
   module Client
     module Helper
       class MmapedFile < Mmap
+        class << self
+          def open_readonly(filepath)
+            MmapedFile.new(filepath, 'r', Mmap::MAP_PRIVATE)
+          end
+
+          def open(filepath)
+            MmapedFile.new(filepath, 'rw', Mmap::MAP_SHARED)
+          end
+
+          def lock_to_process(filepath)
+            m = open(filepath)
+            if m.lock_to_process
+              Kernel.at_exit do
+                open(filepath).unlock
+              end
+              true
+            else
+              false
+            end
+          ensure
+            m.close
+          end
+
+          def ensure_process_exclusive_file(file_prefix = 'mmaped_file')
+            path = nil
+            filename_number = 0
+            until path && Helper::MmapedFile.lock_to_process(path)
+              filename = "#{file_prefix}_#{Prometheus::Client.pid}-#{filename_number}.db"
+              path = File.join(Prometheus::Client.configuration.multiprocess_files_dir, filename)
+              filename_number += 1
+            end
+            path
+          end
+
+          def open_process_exclusive_file(file_prefix = 'mmaped_file')
+            filename = Helper::MmapedFile.ensure_process_exclusive_file(file_prefix)
+            open(filename)
+          end
+        end
+
         MINIMUM_SIZE = 8
         attr_reader :filepath, :size
 
@@ -36,7 +76,7 @@ module Prometheus
         end
 
         def locked_to_process?
-          pid > 0
+          pid > 0 && pid_alive?(pid)
         end
 
         def lock_owner?
@@ -108,43 +148,14 @@ module Prometheus
           munmap
         end
 
-        class << self
-          def open_readonly(filepath)
-            MmapedFile.new(filepath, 'r', Mmap::MAP_PRIVATE)
-          end
-
-          def open(filepath)
-            MmapedFile.new(filepath, 'rw', Mmap::MAP_SHARED)
-          end
-
-          def lock_to_process(filepath)
-            m = open(filepath)
-            if m.lock_to_process
-              Kernel.at_exit do
-                open(filepath).unlock
-              end
-              true
-            else
-              false
-            end
-          ensure
-            m.close
-          end
-
-          def ensure_process_exclusive_file(file_prefix = 'mmaped_file')
-            path = nil
-            filename_number = 0
-            until path && Helper::MmapedFile.lock_to_process(path)
-              filename = "#{file_prefix}_#{Prometheus::Client.pid}-#{filename_number}.db"
-              path = File.join(Prometheus::Client.configuration.multiprocess_files_dir, filename)
-              filename_number += 1
-            end
-            path
-          end
+        private
 
-          def open_process_exclusive_file(file_prefix = 'mmaped_file')
-            filename = Helper::MmapedFile.ensure_process_exclusive_file(file_prefix)
-            open(filename)
+        def pid_alive?(pid)
+          begin
+            Process.getpgid(pid)
+            true
+          rescue Errno::ESRCH
+            false
           end
         end
       end

data/lib/prometheus/client/version.rb

@@ -1,5 +1,5 @@
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta16'
+    VERSION = '0.7.0.beta17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta16
+  version: 0.7.0.beta17
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2