ntq_tools 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a10636cbd4c36ced30ad1daec3f419db31f45b3fd2bcd611915cdd152ef7d82
-  data.tar.gz: 8b86aa7e4770082b4a755cff97eab88de26cc6b7478b510c04d630050a8b2758
+  metadata.gz: d9a6423facf8642edbfb60c8e40feb6ce68d3ebbdcba52c3677df5e7a154f3ad
+  data.tar.gz: b239adf65c0b94498e36a23cbeb13377b2767856352964e216f49d4454f4ef6e
 SHA512:
-  metadata.gz: 4a6b23a31814bd31ce80ef72abd9557f81be5eb6ebf6b5aada2ca40e484076ebf070c6bf034f914e583fce9e9df82703a6530692433d0958e94773eb2ea5d0ca
-  data.tar.gz: fb0594332a15d859e54dd481f5fce2d4d8d5c5f30d5bd662f2c27ca5b13af1d33934d0c1a391034b9090838ed0b14948a0b724a7206259326dcb7d382c6eb514
+  metadata.gz: ac007f1cf19c09875bbdebc547ffe9d48e5c73f849771e09232e4ec14a1344e9b23da1dd702898f99c87bc3a35a7570cbee81eb5c0d6929b40d077fe7809902a
+  data.tar.gz: d7f97a1da8afbda1ca27d6a2022258c913c59ad5bde214d37ca571458dcf60aab7802735f8bac882ef85a4c0315aa1d1f5134d8fbb7eed319a561cf6cfbc2374

data/README.md

@@ -12,6 +12,13 @@ MONITORING_PASSWORD
 MONITORING_USERNAME
 ```
 
+Vous pouvez également désactiver certains services manuellement 
+```ruby
+NtqTools::Monitor.configure do |config|
+  config.sidekiq = false
+end
+```
+
 ## Installation
 Add this line to your application's Gemfile:
 

data/app/controllers/ntq_tools/monitors_controller.rb

@@ -9,7 +9,7 @@ module NtqTools
 
       respond_to do |format|
         format.json do
-          render json: { status: @status, services_status: @services_status }, status: @status == :ok ? :ok : :service_unavailable
+          render json: { status: @status, services_status: @services_status, container_version: ENV['CONTAINER_VERSION'] }, status: @status == :ok ? :ok : :service_unavailable
         end
         format.html do
         end

data/lib/generators/ntq_tools/graphql_scaffold_generator.rb

@@ -239,7 +239,7 @@ FILE
           if defined?(Interactor)
             create_file "app/interactors/#{plural_name}/search_#{plural_name}.rb", <<-FILE
 module #{context_name}
-  class Search#{class_name}
+  class Search#{plural_name.camelcase}
     include Interactor::Organizer
 
     organize Get#{plural_name.camelcase}, PaginateRecords
@@ -249,7 +249,7 @@ end
 
             create_file "app/interactors/#{plural_name}/get_#{plural_name}.rb", <<-FILE
 module #{context_name}
-  class Get#{class_name}
+  class Get#{plural_name.camelcase}
     include Interactor
 
     def call

data/lib/generators/templates/ntq_tools.rb

@@ -6,4 +6,6 @@ NtqTools.setup do |config|
   config.impersonation_enabled = true
   config.impersonation_user_models = ["User"]
 
+  # config.js_model_dir = Rails.root.join("app", "javascript", "react", "hooks")
+
 end

data/lib/ntq_tools/monitor.rb

@@ -1,10 +1,19 @@
 require 'ntq_tools/monitors/redis'
 require 'ntq_tools/monitors/database'
 require 'ntq_tools/monitors/sidekiq'
+require 'ntq_tools/monitors/configuration'
 
 module NtqTools
   class Monitor
 
+    def self.configure
+      yield config
+    end
+
+    def self.config
+      @config ||= ::NtqTools::Monitors::Configuration.new
+    end
+
     # Check if installed services are running, it return a tuple with the status and the services status
     #
     # eg: [:ok, [{name: 'redis', status: 'OK'}, {name: 'database', status: 'OK'}]]
@@ -14,6 +23,8 @@ module NtqTools
     def self.check
       services_status = []
       list.each do |monitor|
+        # skip si le service est désactivé (false) dans la config
+        next if config.respond_to?(monitor.name) && !config.send(monitor.name)
         next unless monitor.is_installed?
 
         services_status << {
@@ -24,14 +35,14 @@ module NtqTools
       status = services_status.all? { |service| service[:status] == 'OK' } ? :ok : :error
       [status, services_status]
     end
-    
+
     def self.list
+      # ATTENTION - Rajouter le nom du nouveau service (:name) dans la class Configuration (attr_accessor)
       [
         ::NtqTools::Monitors::Redis,
         ::NtqTools::Monitors::Database,
         ::NtqTools::Monitors::Sidekiq
       ]
     end
-  
   end
-end
+end

data/lib/ntq_tools/monitors/base.rb

@@ -4,7 +4,7 @@ module NtqTools
       class << self
   
         def name
-          "You must define the name method in your monitor class"
+          "You must define the name method in your monitor class and add it to the configuration class"
         end
   
         def is_installed?

data/lib/ntq_tools/monitors/configuration.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NtqTools
+  module Monitors
+    class Configuration
+      attr_accessor :database, :redis, :sidekiq
+
+      def initialize
+        @database = true
+        @redis    = true
+        @sidekiq  = true
+      end
+    end
+  end
+end

data/lib/ntq_tools/monitors/sidekiq.rb

@@ -1,22 +1,28 @@
 require 'ntq_tools/monitors/base'
+
 module NtqTools
   module Monitors
     class Sidekiq < Base
-  
+
       class << self
         def name
-          "sidekiq"
+          'sidekiq'
         end
-    
+
         def is_installed?
-          ::Gem.loaded_specs.has_key?("sidekiq")
+          ::Gem.loaded_specs.has_key?('sidekiq')
         end
-    
+
         def check
+          require 'sidekiq/api'
           ::Sidekiq::ProcessSet.new.any? { |process| process['busy'] }
+        rescue LoadError
+          raise LoadError, <<-ERROR
+            ::Sidekiq::ProcessSet could not be loaded by gem ntq_tools.
+            It is required for Sidekiq monitoring'
+          ERROR
         end
       end
-  
     end
   end
-end
+end

data/lib/ntq_tools/version.rb

@@ -1,3 +1,3 @@
 module NtqTools
-  VERSION = "0.7.2"
+  VERSION = "0.7.4"
 end

data/lib/ntq_tools.rb

@@ -9,8 +9,10 @@ module NtqTools
   mattr_accessor :impersonation_user_models
   @@impersonation_user_models = []
 
+  mattr_accessor :js_model_dir
+  @@js_model_dir = nil
+
   def self.setup
     yield self
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ntq_tools
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Kevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,6 +73,7 @@ files:
 - lib/ntq_tools/engine.rb
 - lib/ntq_tools/monitor.rb
 - lib/ntq_tools/monitors/base.rb
+- lib/ntq_tools/monitors/configuration.rb
 - lib/ntq_tools/monitors/database.rb
 - lib/ntq_tools/monitors/redis.rb
 - lib/ntq_tools/monitors/sidekiq.rb