Improved error handling.
This commit is contained in:
parent
94bcaf9310
commit
4eb177fc70
1 changed files with 18 additions and 11 deletions
|
@ -8,16 +8,19 @@ module Import::OTRS
|
||||||
uri = URI.parse(url)
|
uri = URI.parse(url)
|
||||||
http = Net::HTTP.new(uri.host, uri.port)
|
http = Net::HTTP.new(uri.host, uri.port)
|
||||||
|
|
||||||
user = Setting.get('import_otrs_user');
|
|
||||||
password = Setting.get('import_otrs_password');
|
|
||||||
if user && user != '' && password && password != ''
|
|
||||||
http.basic_auth user, password
|
|
||||||
end
|
|
||||||
if url =~ /https/i
|
if url =~ /https/i
|
||||||
http.use_ssl = true
|
http.use_ssl = true
|
||||||
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
||||||
end
|
end
|
||||||
request = Net::HTTP::Get.new(uri.request_uri)
|
request = Net::HTTP::Get.new(uri.request_uri)
|
||||||
|
|
||||||
|
# http basic auth (if needed)
|
||||||
|
user = Setting.get('import_otrs_user');
|
||||||
|
password = Setting.get('import_otrs_password');
|
||||||
|
if user && user != '' && password && password != ''
|
||||||
|
request.basic_auth user, password
|
||||||
|
end
|
||||||
|
|
||||||
begin
|
begin
|
||||||
response = http.request(request)
|
response = http.request(request)
|
||||||
# puts 'R:' + response.body.to_s
|
# puts 'R:' + response.body.to_s
|
||||||
|
@ -41,12 +44,6 @@ module Import::OTRS
|
||||||
uri = URI.parse(url)
|
uri = URI.parse(url)
|
||||||
http = Net::HTTP.new(uri.host, uri.port)
|
http = Net::HTTP.new(uri.host, uri.port)
|
||||||
|
|
||||||
user = Setting.get('import_otrs_user');
|
|
||||||
password = Setting.get('import_otrs_password');
|
|
||||||
if user && user != '' && password && password != ''
|
|
||||||
http.basic_auth user, password
|
|
||||||
end
|
|
||||||
|
|
||||||
if url =~ /https/i
|
if url =~ /https/i
|
||||||
http.use_ssl = true
|
http.use_ssl = true
|
||||||
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
http.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
||||||
|
@ -55,6 +52,13 @@ module Import::OTRS
|
||||||
request.set_form_data(data)
|
request.set_form_data(data)
|
||||||
response = http.request(request)
|
response = http.request(request)
|
||||||
|
|
||||||
|
# http basic auth (if needed)
|
||||||
|
user = Setting.get('import_otrs_user');
|
||||||
|
password = Setting.get('import_otrs_password');
|
||||||
|
if user && user != '' && password && password != ''
|
||||||
|
response.basic_auth user, password
|
||||||
|
end
|
||||||
|
|
||||||
if !response
|
if !response
|
||||||
raise "Can't connect to #{url}, got no response!"
|
raise "Can't connect to #{url}, got no response!"
|
||||||
end
|
end
|
||||||
|
@ -330,6 +334,9 @@ module Import::OTRS
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
user = User.where( :email => email ).first
|
user = User.where( :email => email ).first
|
||||||
|
if !user
|
||||||
|
user = User.where( :login => email ).first
|
||||||
|
end
|
||||||
if !user
|
if !user
|
||||||
begin
|
begin
|
||||||
display_name = Mail::Address.new( article_new[:from] ).display_name ||
|
display_name = Mail::Address.new( article_new[:from] ).display_name ||
|
||||||
|
|
Loading…
Reference in a new issue