gruf 2.16.0 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d83766bdf6739e3997891fd7b5e5ecd393aa17c8fab0ab839ff0789756726cf
-  data.tar.gz: b959a1644c29c5732438a60a079dc318136146eddb96d4060091f0f39fc7e5c6
+  metadata.gz: f0508561578b2ebd6490bebfeeee8f4442d4bcec1d1cb877dc0005933564fc33
+  data.tar.gz: b4130a47d10681a4876046aa782640091799d99f433cc5f6ae55f6dce1f60ecf
 SHA512:
-  metadata.gz: ef7b011e2d693c2cb05b10697e0b67fcedb1d72ffc8adeac5f207557a30494860878a5b80e94fc8d512e7a4e5e6cb69b2bc8a854e72cd80f2e1507e0c1f379b6
-  data.tar.gz: a75845718660f4013015eff266c737315ce7bb00e147c83bc175390c87d890be525ee88059f5bb3ec224bbe30a96fb348143dfccd0c377a2dee8bd3eb674a6ea
+  metadata.gz: 1a9e198be4481b4e56c3e57fb7d76be2ce97e6cbe30368fadc990a505d1864c98f1e0d25f02c8209a0dafd89021537b15f6f12a83323ec3c8a7ff114c7c8094b
+  data.tar.gz: 5fc8489af23aa0e387aa84dc4104e7812aa0a767ddb32e6bf83f331442b79073f57c5ef97b2326ff9ec64cebf018d76589ce5f964bf67a69e758dd0780508423

data/CHANGELOG.md

@@ -2,6 +2,16 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.16.2
+
+* [#175] Fix code reload thread-safety. Calls to `Zeitwerk::Loader#setup` are now made in a thread-safe manner.
+
+### 2.16.1
+
+* Fix issue where default gRPC health check was loaded even if unused or not desired; now only loaded when requested
+
+### 2.16.0
+
 - Add opt-in ability to serve the official [gRPC health check](https://github.com/grpc/grpc/blob/master/src/ruby/pb/grpc/health/v1/health_services_pb.rb)
   automatically via `health_check_enabled` configuration option (or `GRUF_HEALTH_CHECK_ENABLED` environment
   variable).

data/lib/gruf/cli/executor.rb

@@ -161,9 +161,7 @@ module Gruf
       def bind_health_check!(services)
         # do this here to trigger autoloading the controller in zeitwerk, since we don't explicitly load this
         # controller. This binds the service and makes sure the method handlers are setup.
-        # rubocop:disable Lint/Void
-        Gruf::Controllers::HealthController
-        # rubocop:enable Lint/Void
+        require 'gruf/controllers/health_controller'
         # if we're already bound to the services array (say someone explicitly passes the health check in, skip)
         return services if services.include?(::Grpc::Health::V1::Health::Service)
 

data/lib/gruf/controllers/autoloader.rb

@@ -47,7 +47,11 @@ module Gruf
       # Reload all files managed by the autoloader, if reloading is enabled
       #
       def reload
-        @loader.reload if @reloading_enabled
+        if @reloading_enabled
+          reload_mutex do
+            @loader.reload
+          end
+        end
       end
 
       private
@@ -69,6 +73,17 @@ module Gruf
         @loader.eager_load
         @setup = true
       end
+
+      ##
+      # Handle thread-safe access to the loader
+      #
+      def reload_mutex(&block)
+        @reload_mutex ||= begin
+          require 'monitor'
+          Monitor.new
+        end
+        @reload_mutex.synchronize(&block)
+      end
     end
   end
 end

data/lib/gruf/controllers/health_controller.rb

@@ -15,6 +15,8 @@
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'grpc/health/v1/health_services_pb'
+
 module Gruf
   module Controllers
     ##

data/lib/gruf/version.rb

@@ -16,5 +16,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.16.0'
+  VERSION = '2.16.2'
 end

data/lib/gruf.rb

@@ -20,7 +20,6 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/concern'
 require 'active_support/inflector'
-require 'grpc/health/v1/health_services_pb'
 require 'base64'
 
 # use Zeitwerk to lazily autoload all the files in the lib directory
@@ -29,6 +28,7 @@ loader = ::Zeitwerk::Loader.new
 loader.tag = File.basename(__FILE__, '.rb')
 loader.inflector = ::Zeitwerk::GemInflector.new(__FILE__)
 loader.ignore("#{__dir__}/gruf/integrations/rails/railtie.rb")
+loader.ignore("#{__dir__}/gruf/controllers/health_controller.rb")
 loader.push_dir(__dir__)
 loader.setup
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.16.2
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-14 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler-audit