remove cloudflare error handling
This commit is contained in:
@@ -80,15 +80,6 @@ class DbUpdater
|
|||||||
local_file_checksum(filename)
|
local_file_checksum(filename)
|
||||||
end
|
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)
|
def update(verbose = false)
|
||||||
FILES.each do |filename|
|
FILES.each do |filename|
|
||||||
begin
|
begin
|
||||||
@@ -110,7 +101,7 @@ class DbUpdater
|
|||||||
puts " [i] Database File Checksum : #{db_checksum}" if verbose
|
puts " [i] Database File Checksum : #{db_checksum}" if verbose
|
||||||
|
|
||||||
unless dl_checksum == db_checksum
|
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
|
end
|
||||||
rescue => e
|
rescue => e
|
||||||
puts ' [i] Restoring Backup due to error' if verbose
|
puts ' [i] Restoring Backup due to error' if verbose
|
||||||
|
|||||||
@@ -33,10 +33,9 @@ class DownloadError < HttpError
|
|||||||
end
|
end
|
||||||
|
|
||||||
class ChecksumError < StandardError
|
class ChecksumError < StandardError
|
||||||
attr_reader :file, :cloudflare_info
|
attr_reader :file
|
||||||
|
|
||||||
def initialize(file, cloudflare_info)
|
def initialize(file)
|
||||||
@file = file
|
@file = file
|
||||||
@cloudflare_info = cloudflare_info
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -470,12 +470,6 @@ def main
|
|||||||
puts
|
puts
|
||||||
end
|
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')
|
puts critical('Please submit this info as an Github issue')
|
||||||
exit(1)
|
exit(1)
|
||||||
rescue => e
|
rescue => e
|
||||||
|
|||||||
Reference in New Issue
Block a user