From c76c2db2be80ccbc98a0bcd75f111a4f5c117880 Mon Sep 17 00:00:00 2001 From: nishiki Date: Sun, 26 Jan 2014 17:26:02 +0100 Subject: [PATCH] fix log disconnected --- lib/Server.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Server.rb b/lib/Server.rb index 489c8d5..1f995b6 100644 --- a/lib/Server.rb +++ b/lib/Server.rb @@ -38,7 +38,13 @@ class Server next end + if !msg['action'].nil? && msg['action'] == 'close' + @log.info("#{client.peeraddr[3]} is disconnected") + close_connection(client) + end + if msg['gpg_key'].nil? || msg['gpg_key'].empty? || msg['password'].nil? || msg['password'].empty? + @log.warning("#{client.peeraddr[3]} is disconnected because no password or no gpg_key") close_connection(client) next end @@ -53,11 +59,8 @@ class Server when 'delete' @log.debug("#{client.peeraddr[3]} DELETE gpg_key=#{msg['gpg_key']} suffix=#{msg['suffix']}") client.puts delete_file(msg) - when 'close' - @log.info("#{client.peeraddr[3]} is disconnected") - close_connection(client) else - @log.warning("#{client.peeraddr[3]} is disconnected for unkwnow command") + @log.warning("#{client.peeraddr[3]} is disconnected because unkwnow command") send_msg = {:action => 'unknown', :gpg_key => msg['gpg_key'], :error => 'server.error.client.unknown'}