process_settings 0.17.0 → 0.18.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93741a97801bc4783109ff2423f1d1254f764ccad969f8810e242cb32a48ca18
-  data.tar.gz: 8e8a865c9f03fa41dc9dd61b5aaa2d59ef86fb66753ca891898942677c9c518e
+  metadata.gz: 15a15a0c5c7ea497858038e4b4be06e63aea209c8e3033662c28963d19839d39
+  data.tar.gz: ba4e23e5216b60ecc7e5e999dcac7d1679c90fd2cf6b712624da9a04aa629c1a
 SHA512:
-  metadata.gz: f42cb27c7d884a6be0e4543fe148f2e7cc68d2f8e41883789a5ee5a32db9ee4cec5de349f0f576dcb551f07f60e1b9d749a8d4b122ba43aa7346c4cb13f91014
-  data.tar.gz: 981330f869266006284477f9146f6686724d0240745ec4112b1b62ba090e4d28f5a211f3a515a3dba1a70f538e87a8191c6d81958c71f628711879031e8e1d11
+  metadata.gz: 44058ab68dbb74cdf889bd57ac0bff0324f35f4608a27f67623da3b17a8ee0b4f9bfef24311395e969f941db28c2a5137c79c3233db75659fcc9e1f4239797e1
+  data.tar.gz: 3310afc60c343999207561d0e2820dc6ff4e985f71b1e25b8402fe7f3f39c762dd560f83cf78a5ccd57fa937a13c9dfdb43f41e57e8aa3326eb3a63d05f628bd

data/lib/process_settings/file_monitor.rb

@@ -8,6 +8,8 @@ require 'active_support/deprecation'
 require 'process_settings/abstract_monitor'
 require 'process_settings/targeted_settings'
 require 'process_settings/hash_path'
+require 'process_settings/helpers/watchdog'
+require 'exception_handling'
 
 module ProcessSettings
   class FileMonitor < AbstractMonitor
@@ -24,6 +26,31 @@ module ProcessSettings
       start_internal(enable_listen_thread?(environment))
     end
 
+    def start_watchdog_thread(file_path = :missing)
+      if file_path == :missing
+        ActiveSupport::Deprecation.warn("ProcessEnvSetup.start_watchdog_thread with no arguments is deprecated")
+        file_path = ProcessSettings::Monitor.file_path
+      end
+
+      @watchdog_thread and raise ArgumentError, "watchdog thread already running!"
+      @watchdog_thread = Thread.new do
+        watchdog = ProcessSettings::Watchdog.new(file_path)
+        loop do
+          ExceptionHandling.ensure_safe("ProcessSettings::Watchdog thread") do
+            sleep(1.minute)
+            watchdog.check
+          end
+        end
+      end
+    end
+
+    def stop_watchdog_thread
+      if @watchdog_thread
+        Thread.kill(@watchdog_thread)
+        @watchdog_thread = nil
+      end
+    end
+
     def start
       start_internal(enable_listen_thread?)
     end

data/lib/process_settings/helpers/watchdog.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/numeric/time'
+
+module ProcessSettings
+  class Watchdog
+    class OutOfSync < StandardError; end
+
+    MAX_MTIME_DIFFERENCE = 2.minutes
+
+    def initialize(process_settings_file_path)
+      @process_settings_file_path = process_settings_file_path or raise ArgumentError, "process_settings_file_path must be passed"
+    end
+
+    def check
+      if version_from_memory != version_from_disk && (Time.now - mtime_from_disk) > MAX_MTIME_DIFFERENCE
+        raise ProcessSettings::OutOfSync.new("ProcessSettings versions are out of sync!\n Version from Disk: #{version_from_disk}\n Version from Memory: #{version_from_memory}\n mtime of file: #{mtime_from_disk}")
+      end
+    end
+
+    private
+
+    attr_reader :process_settings_file_path
+
+    def version_from_memory
+      ProcessSettings.instance.untargeted_settings.version
+    end
+
+    def version_from_disk
+      ProcessSettings::TargetedSettings.from_file(process_settings_file_path, only_meta: true).version
+    end
+
+    def mtime_from_disk
+      File.mtime(process_settings_file_path)
+    end
+  end
+end

data/lib/process_settings/monitor.rb

@@ -46,7 +46,7 @@ module ProcessSettings
       def logger=(new_logger)
         ActiveSupport::Deprecation.warn("ProcessSettings::Monitor.logger is deprecated and will be removed in v1.0.")
         @logger = new_logger
-        Listen.logger ||= new_logger
+        Listen.logger = new_logger unless Listen.instance_variable_get(:@logger)
       end
 
       deprecate :logger, :logger=, :file_path, :file_path=, deprecator: ActiveSupport::Deprecation.new('1.0', 'ProcessSettings')

data/lib/process_settings/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ProcessSettings
-  VERSION = '0.17.0'
+  VERSION = '0.18.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: process_settings
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0.pre.1
 platform: ruby
 authors:
 - Invoca
@@ -94,6 +94,7 @@ files:
 - lib/process_settings/file_monitor.rb
 - lib/process_settings/hash_path.rb
 - lib/process_settings/hash_with_hash_path.rb
+- lib/process_settings/helpers/watchdog.rb
 - lib/process_settings/monitor.rb
 - lib/process_settings/replace_versioned_file.rb
 - lib/process_settings/settings.rb
@@ -122,9 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: