remove cloudflare error handling

This commit is contained in:
Christian Mehlmauer
2016-11-01 19:38:47 +01:00
parent 3c74ee8d97
commit d344f84824
3 changed files with 3 additions and 19 deletions

View File

@@ -80,15 +80,6 @@ class DbUpdater
local_file_checksum(filename)
end
def get_cloudflare_info
begin
res = Browser.get(remote_file_url('/cdn-cgi/trace'), request_params)
res.body
rescue
nil
end
end
def update(verbose = false)
FILES.each do |filename|
begin
@@ -110,7 +101,7 @@ class DbUpdater
puts " [i] Database File Checksum : #{db_checksum}" if verbose
unless dl_checksum == db_checksum
raise ChecksumError.new(File.read(local_file_path(filename)), get_cloudflare_info), "#{filename}: checksums do not match (local: #{dl_checksum} remote: #{db_checksum})"
raise ChecksumError.new(File.read(local_file_path(filename))), "#{filename}: checksums do not match (local: #{dl_checksum} remote: #{db_checksum})"
end
rescue => e
puts ' [i] Restoring Backup due to error' if verbose

View File

@@ -33,10 +33,9 @@ class DownloadError < HttpError
end
class ChecksumError < StandardError
attr_reader :file, :cloudflare_info
attr_reader :file
def initialize(file, cloudflare_info)
def initialize(file)
@file = file
@cloudflare_info = cloudflare_info
end
end

View File

@@ -470,12 +470,6 @@ def main
puts
end
if e.cloudflare_info
puts critical('Cloudflare Info:')
puts e.cloudflare_info
puts
end
puts critical('Please submit this info as an Github issue')
exit(1)
rescue => e