nishiki/mpw
1
0
Fork 0
mirror of https://github.com/nishiki/manage-password.git synced 2024-11-27 07:33:05 +00:00
Code Issues Releases Activity

add timeout

Browse source
This commit is contained in:
nishiki 2014-08-31 10:59:33 +02:00
parent 4a564dd07e
commit 1390850e18
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
MPW/Sync/MPWSync.rb
View file

@ -11,6 +11,7 @@ module MPW
require 'i18n'
require 'socket'
require 'json'
require 'timeout'
class MPWSync
@ -37,9 +38,20 @@ module MPW
@password = password
@suffix = path
TCPSocket.open(@host, @port) do
@enable = true
Timeout.timeout(10) do
begin
TCPSocket.open(@host, @port) do
puts 'testi2'
@enable = true
end
rescue Errno::ENETUNREACH
retry
end
end
rescue Timeout::Error
puts 'timeout'
@error_msg = "#{I18n.t('error.timeout')}\n#{e}"
@enable = false
rescue Exception => e
@error_msg = "#{I18n.t('error.sync.connection')}\n#{e}"
@enable = false
@ -58,9 +70,9 @@ module MPW
msg = nil
TCPSocket.open(@host, @port) do |socket|
send_msg = {:action => 'get',
:gpg_key => @gpg_key,
:password => @password,
:suffix => @suffix}
:gpg_key => @gpg_key,
:password => @password,
:suffix => @suffix}
socket.puts send_msg.to_json
msg = JSON.parse(socket.gets)