prometheus-client-mmap 0.7.0.beta10 → 0.7.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8458ed064082dd282bb57a7f449da9042d57ec7c
-  data.tar.gz: 4fa6bab0e01f0bdac5260627afecf61a71bad2d7
+  metadata.gz: 20a1732cd0b1d06b876c82eac1ee2e2b43f461d0
+  data.tar.gz: 1720a2b8f8b5d81dc817876f6cbce85a0f76f838
 SHA512:
-  metadata.gz: a5ad6aa9d4c5a9351ae91baa4be9c1cd8757587bfc32fcdfb64e12d1d9e30faee558ad87f0434ef702263721f939a61087283a5fad0d8b782e4019101e6263f4
-  data.tar.gz: e7c731aad2ece103e9ea21d3f01221155435d3c85313fe85016b8d5390d8949d435247f957b4b93a55e780e20d83796381157bc02f9e4dfd8009d2093e915cf1
+  metadata.gz: fa2cacd9b3b5f63fe7022a9d848c7e02f2a76959787ae4be62ead6031a1bc05060aeb0169e58b3a8bc9aa1e4afce8e59181ed4bf41e8350b05ff417c8cbea6e3
+  data.tar.gz: 2573ac9665891684612a9768bbb9b8c7f1c2e6c05d15c573c4f5377da1482a3a678953e9d3e1dc47d015b75cdbd3ef7a9eb144989287ca5e38fad3ef2dddfa1d

data/lib/prometheus/client/mmaped_dict.rb

@@ -1,4 +1,5 @@
 require 'prometheus/client'
+require 'mmap'
 
 module Prometheus
   module Client
@@ -48,8 +49,11 @@ module Prometheus
         @m[pos..pos+7] = [value].pack('d')
       end
 
-      def close()
+      def close
         @m.munmap
+      rescue TypeError => e
+        Prometheus::Client.logger.warn("munmap raised error #{e}")
+      ensure
         @f.close
       end
 

data/lib/prometheus/client/mmaped_value.rb

@@ -9,30 +9,20 @@ module Prometheus
       @@files_lock = Mutex.new
       @@pid = Process.pid
 
-      def initialize(type, metric_name, name, labels, multiprocess_mode='')
-        file_prefix = type.to_s
+      def initialize(type, metric_name, name, labels, multiprocess_mode = '')
+        @pid = Process.pid
+        @file_prefix = type.to_s
+        @metric_name = metric_name
+        @name = name
+        @labels = labels
         if type == :gauge
-          file_prefix += '_' + multiprocess_mode.to_s
+          @file_prefix += '_' + multiprocess_mode.to_s
         end
 
-        @@files_lock.synchronize do
-          unless @@files.has_key?(file_prefix)
-            filename = File.join(Prometheus::Client.configuration.multiprocess_files_dir, "#{file_prefix}_#{@@pid}.db")
-            @@files[file_prefix] = MmapedDict.new(filename)
-          end
-        end
-
-        @file = @@files[file_prefix]
-        labelnames = []
-        labelvalues = []
-        labels.each do |k, v|
-          labelnames << k
-          labelvalues << v
-        end
+        self.class.reset_on_pid_change if self.class.pid_changed?
 
-        @key = [metric_name, name, labelnames, labelvalues].to_json
-        @value = read_value(@key)
         @mutex = Mutex.new
+        initialize_file
       end
 
       def increment(amount=1)
@@ -57,10 +47,62 @@ module Prometheus
         end
       end
 
+      def self.reset_on_pid_change
+        @@files_lock.synchronize do
+          if pid_changed?
+            @@pid = Process.pid
+            @@files = {}
+          end
+        end
+      end
+
+      def self.reinitialize_on_pid_change
+        reset_on_pid_change
+        ObjectSpace.each_object(MmapedValue, &:reinitialize)
+      end
+
+      def self.pid_changed?
+        @@pid != Process.pid
+      end
+
       def self.multiprocess
         true
       end
 
+      def reinitialize
+        if @pid != Process.pid
+          @pid = Process.pid
+          initialize_file
+        end
+      end
+
+      def initialize_file
+        @@files_lock.synchronize do
+          unless @@files.has_key?(@file_prefix)
+            unless @file.nil?
+              puts @file
+              @file.close
+            end
+
+            filename = File.join(Prometheus::Client.configuration.multiprocess_files_dir, "#{@file_prefix}_#{@@pid}.db")
+            @@files[@file_prefix] = MmapedDict.new(filename)
+          end
+        end
+
+        @mutex.synchronize do
+          @file = @@files[@file_prefix]
+          labelnames = []
+          labelvalues = []
+          @labels.each do |k, v|
+            labelnames << k
+            labelvalues << v
+          end
+
+          @key = [@metric_name, @name, labelnames, labelvalues].to_json
+          @value = read_value(@key)
+        end
+      end
+
       private
 
       def write_value(key, val)
@@ -77,4 +119,3 @@ module Prometheus
     end
   end
 end
-

data/lib/prometheus/client/version.rb

@@ -2,6 +2,6 @@
 
 module Prometheus
   module Client
-    VERSION = '0.7.0.beta10'
+    VERSION = '0.7.0.beta11'
   end
 end

data/lib/prometheus/client.rb

@@ -1,5 +1,6 @@
 require 'prometheus/client/registry'
 require 'prometheus/client/configuration'
+require 'prometheus/client/mmaped_value'
 
 module Prometheus
   # Client is a ruby implementation for a Prometheus compatible client.
@@ -23,6 +24,10 @@ module Prometheus
       def logger
         configuration.logger
       end
+
+      def reinitialize_on_pid_change
+        ::Prometheus::Client::MmapedValue.reinitialize_on_pid_change
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus-client-mmap
 version: !ruby/object:Gem::Version
-  version: 0.7.0.beta10
+  version: 0.7.0.beta11
 platform: ruby
 authors:
 - Tobias Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mmap2