upfluence-utils 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e33550cf48ab449c4ad663c314c37cf4afdabb79c388423af3aab6638482a6a
-  data.tar.gz: 9809f710f12c5e457a148142241b5e26ba38df7b8c62b32dcec5ee492a901c28
+  metadata.gz: bf89bde520f3bb7e52d3b43d14a6e514a64ef00359acc7a83a8380487279be04
+  data.tar.gz: bddf013280ab4620b7c96da45e47572b96aefe1bf6909b85be6e2c1281f9c06b
 SHA512:
-  metadata.gz: 90c56072e1ef3cc4a8665b747f5f6c5ba2b0fa6a7a6240cfefb91077a69508633a06a42c20250e0c947738493d9ef9cf511306a30f8708389815a913d88ef9b4
-  data.tar.gz: 726244c5cabefe815f0c955c0a9a26100b49c2ec547a449eb894cefeac2c65e359ee79c97281f0f472851bf4778444391c1c392c1a405f17d012ea5bb820a90f
+  metadata.gz: 99694e5f48b6878ec4b47d0e1bbba0ca7b99e531e4224750ab9ebe7856d81dc902dc2026e99ea3c0d2dd17bc71e5c21a5ba906f092bf1fe2aa4e64d6413f7592
+  data.tar.gz: 19f50f74f14cbcc531a769d66b248b266b50e091e37e60b1b4f48a49a8022d63ca57b903a84fd69ce16df6a7164f5b24a7839b31213d10602b1de9f546920237

data/lib/upfluence/http/endpoint/api_endpoint.rb

@@ -84,6 +84,10 @@ module Upfluence
       Sinatra::Base.not_found do
         [404, {}, { error: 'not_found' }.to_json]
       end
+
+      Sinatra::Base.error ActiveRecord::RecordInvalid do |e|
+        [422, Base::Exceptions::ValidationError.from_model(e.record).to_json]
+      end
     end
   end
 end

data/lib/upfluence/http/server.rb

@@ -50,7 +50,7 @@ module Upfluence
           use Rack::ETag
           use Middleware::CORS if Upfluence.env.development?
 
-          map '/healthcheck'  do
+          map '/healthcheck' do
             run(opts[:healthcheck_endpoint] || Endpoint::Healthcheck.new)
           end
 
@@ -94,10 +94,12 @@ module Upfluence
         loop do
           sleep @options[:push_gateway_interval]
 
-          push.replace Prometheus::Client.registry
+          begin
+            push.replace Prometheus::Client.registry
+          rescue => e
+            Upfluence.error_logger.notify(e)
+          end
         end
-      rescue => e
-        puts e
       end
     end
   end

data/lib/upfluence/utils.rb

@@ -1,5 +1,6 @@
 require 'upfluence/utils/version'
 require 'upfluence/utils/thrift'
+require 'upfluence/utils/semaphore'
 require 'upfluence/logger'
 require 'upfluence/error_logger'
 require 'upfluence/environment'

data/lib/upfluence/utils/semaphore.rb

@@ -0,0 +1,38 @@
+module Upfluence
+  module Utils
+    class Semaphore
+      def initialize(size)
+        @size = size
+        @used = 0
+        @mutex = Mutex.new
+        @cond = ConditionVariable.new
+      end
+
+      def acquire(count = 1)
+        @mutex.synchronize do
+          loop do
+            break if @used + count <= @size
+
+            @cond.wait(@mutex)
+          end
+
+          @used += count
+        end
+      end
+
+      def release(count = 1)
+        @mutex.synchronize do
+          @used -= count
+          @cond.broadcast
+        end
+      end
+
+      def synchronize(count = 1, &block)
+        acquire(count)
+        block.call
+      ensure
+        release(count)
+      end
+    end
+  end
+end

data/lib/upfluence/utils/thrift/middleware/connection_pooler.rb

@@ -0,0 +1,21 @@
+require 'active_record/base'
+
+module Upfluence
+  module Utils
+    module Thrift
+      module Middleware
+        class ConnectionPooler
+          def initialize(app)
+            @app = app
+          end
+
+          def method_missing(method, *args, &block)
+            ActiveRecord::Base.connection_pool.with_connection do
+              @app.send(method, *args, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/upfluence/utils/version.rb

@@ -1,5 +1,5 @@
 module Upfluence
   module Utils
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

data/rbutils.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency 'upfluence-thrift', '~> 1.0', '>= 1.0.3'
+  spec.add_runtime_dependency 'upfluence-thrift', '~> 2.1'
   spec.add_runtime_dependency 'base-thrift', '>= 0.1.0'
   spec.add_runtime_dependency 'sinatra'
   spec.add_runtime_dependency 'redis'
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'puma'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'stackprof'
-  spec.add_runtime_dependency 'prometheus-client'
+  spec.add_runtime_dependency 'prometheus-client', '~> 0.9.0'
   spec.add_runtime_dependency 'userializer'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upfluence-utils
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Upfluence
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: base-thrift
   requirement: !ruby/object:Gem::Requirement
@@ -202,16 +196,16 @@ dependencies:
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: userializer
   requirement: !ruby/object:Gem::Requirement
@@ -265,9 +259,11 @@ files:
 - lib/upfluence/pool.rb
 - lib/upfluence/utils.rb
 - lib/upfluence/utils/http/middleware/null.rb
+- lib/upfluence/utils/semaphore.rb
 - lib/upfluence/utils/thrift.rb
 - lib/upfluence/utils/thrift/middleware.rb
 - lib/upfluence/utils/thrift/middleware/active_record.rb
+- lib/upfluence/utils/thrift/middleware/connection_pooler.rb
 - lib/upfluence/utils/thrift/middleware/error_catcher.rb
 - lib/upfluence/utils/thrift/middleware/request_logger.rb
 - lib/upfluence/utils/thrift/middleware/timeout.rb
@@ -292,8 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Upfluence common utils for Ruby projects