##// END OF EJS Templates
jro_apps » redmine
RSS
Code cleanup....
Jean-Philippe Lang -
r13196:9f5eb591131e
parent child
Show More
Side by Side Unified
Context file:
r13196:9f5eb591131e Loading diff...:
Show file before | Show file after | Hide comments
@@ -85,11 +85,9 module Redmine
85 begin
85 begin
86 yaml = YAML::load(ERB.new(File.read(filename)).result)
86 yaml = YAML::load(ERB.new(File.read(filename)).result)
87 rescue ArgumentError
87 rescue ArgumentError
88 $stderr.puts "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
88 abort "Your Redmine configuration file located at #{filename} is not a valid YAML file and could not be loaded."
89 exit 1
90 rescue SyntaxError => e
89 rescue SyntaxError => e
91 $stderr.puts "A syntax error occurred when parsing your Redmine configuration file located at #{filename} with ERB:\n#{e.message}"
90 abort "A syntax error occurred when parsing your Redmine configuration file located at #{filename} with ERB:\n#{e.message}"
92 exit 1
93 end
91 end
94 conf = {}
92 conf = {}
95 if yaml.is_a?(Hash)
93 if yaml.is_a?(Hash)
@@ -100,8 +98,7 module Redmine
100 conf.merge!(yaml[env])
98 conf.merge!(yaml[env])
101 end
99 end
102 else
100 else
103 $stderr.puts "Your Redmine configuration file located at #{filename} is not a valid Redmine configuration file."
101 abort "Your Redmine configuration file located at #{filename} is not a valid Redmine configuration file."
104 exit 1
105 end
102 end
106 conf
103 conf
107 end
104 end
@@ -121,8 +118,7 module Redmine
121 begin
118 begin
122 Regexp.new value.to_s.strip
119 Regexp.new value.to_s.strip
123 rescue => e
120 rescue => e
124 $stderr.puts "Invalid regular expression set as #{name} setting in your Redmine configuration file:\n#{e.message}"
121 abort "Invalid regular expression set as #{name} setting in your Redmine configuration file:\n#{e.message}"
125 exit 1
126 end
122 end
127 end
123 end
128 end
124 end
General Comments 0
You need to be logged in to leave comments. Login now