Allow exceptions that contain error information.

cyisfor · Oct 26, 2012 · c997f00 · c997f00
1 parent f2368c3
commit c997f00
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/cjdns-lib/interface.rb b/lib/cjdns-lib/interface.rb
@@ -121,11 +121,11 @@ def parse_configfile(conf = [ '/etc/cjdns/cjdroute.conf', '/etc/cjdroute.conf',
       conf.each do |file|
         next unless File.exists? file
 
-        begin
+#        begin
           admin = JSON.parse(File.open(file).read)['admin']
-        rescue JSON::ParserError
-          raise "failed to parse configuration file. does '#{file}' contain valid json?"
-        end
+#        rescue JSON::ParserError
+#          raise "failed to parse configuration file. does '#{file}' contain valid json?"
+#        end
 
         host, port = admin['bind'].split(':')
         return { 'host' => host, 'port' => port, 'password' => admin['password'] }