fixed conflict after merge with dev

This commit is contained in:
Nweni
2019-11-28 16:47:12 +06:30
37 changed files with 295 additions and 430 deletions

View File

@@ -112,7 +112,6 @@ authorize_resource :class => false
rescue Net::OpenTimeout
response = { status: false, message: "Can't open membership server "}
rescue OpenURI::HTTPError
puts "Fire in here"
response = { status: false, message: "Can't open membership server "}
rescue SocketError
response = { status: false, message: "Can't open server "}
@@ -121,9 +120,6 @@ authorize_resource :class => false
rescue Errno::ECONNREFUSED, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError
response = { status: false, message: "Can't open membership server"}
end
puts url
puts response
@message = @result.parsed_response['message']
end