From 264438e3b57e287fa3e3a87ffcacd9362551a3e6 Mon Sep 17 00:00:00 2001 From: Christophe Gherardi <44464440+AltiUP@users.noreply.github.com> Date: Thu, 8 May 2025 10:00:21 +0200 Subject: [PATCH] Supports Ruby 3.1.0 Adds check and modifies processing --- extra/cockpit/foreman-cockpit-session | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/extra/cockpit/foreman-cockpit-session b/extra/cockpit/foreman-cockpit-session index 6211e6358..3c3cb588e 100755 --- a/extra/cockpit/foreman-cockpit-session +++ b/extra/cockpit/foreman-cockpit-session @@ -21,7 +21,11 @@ class Settings def load! settings_path = ENV['FOREMAN_COCKPIT_SETTINGS'] || '/etc/foreman-cockpit/settings.yml' - @settings = YAML.safe_load(File.read(settings_path), [Symbol]) + @settings = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0') + YAML.safe_load(File.read(settings_path), permitted_classes: [Symbol]) + else + YAML.safe_load(File.read(settings_path), [Symbol]) + end LOG.level = Logger.const_get(@settings.fetch(:log_level, 'INFO')) LOG.info("Running foreman-cockpit-session with settings from #{settings_path}:\n#{@settings.inspect}") end