shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

B #-: Parse yaml with aliases in ruby 3.1 (#2984) (#3097)

Browse Source 
Co-authored-by: Tino Vázquez <cvazquez@opennebula.io>
This commit is contained in:
Jan Orel 2024-06-10 13:44:50 +02:00 committed by GitHub
parent 2cf4744cc0
commit ed5f3898fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sunstone/models/SunstoneViews.rb
View File

@ -35,7 +35,11 @@ class SunstoneViews
raise "Sunstone configuration file does not contain default view mode, aborting" if mode.nil?
@views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
if Psych::VERSION > '4.0'
@views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE, aliases: true)
else
@views_config = YAML.load_file(VIEWS_CONFIGURATION_FILE)
end
base_path = SUNSTONE_ROOT_DIR+'/public/js/'
@ -49,7 +53,11 @@ class SunstoneViews
reg = VIEWS_CONFIGURATION_DIR + mode + '/'
m = p_path.match(/^#{reg}(.*).yaml$/)
if m && m[1]
@views[m[1]] = YAML.load_file(p_path)
if Psych::VERSION > '4.0'
@views[m[1]] = YAML.load_file(p_path, aliases: true)
else
@views[m[1]] = YAML.load_file(p_path)
end
end
end
end

12
src/sunstone/sunstone-server.rb
View File

@ -158,7 +158,11 @@ end
##############################################################################
begin
$conf = YAML.load_file(CONFIGURATION_FILE)
if Psych::VERSION > '4.0'
$conf = YAML.load_file(CONFIGURATION_FILE, aliases: true)
else
$conf = YAML.load_file(CONFIGURATION_FILE)
end
rescue Exception => e
STDERR.puts "Error parsing config file #{CONFIGURATION_FILE}: #{e.message}"
exit 1
@ -359,7 +363,11 @@ helpers do
def build_conf_locals
logos_conf = nil
begin
logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
if Psych::VERSION > '4.0'
logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE, aliases: true)
else
logos_conf = YAML.load_file(LOGOS_CONFIGURATION_FILE)
end
rescue Exception => e
logger.error { "Error parsing config file #{LOGOS_CONFIGURATION_FILE}: #{e.message}" }
error 500, ""