lib/logstash/inputs/tcp.rb in logstash-input-tcp-3.0.4 vs lib/logstash/inputs/tcp.rb in logstash-input-tcp-3.0.6

@@ -112,11 +112,11 @@
         socket = add_connection_socket(server_socket.accept)
         # start a new thread for each connection.
         server_connection_thread(output_queue, socket)
       rescue OpenSSL::SSL::SSLError => e
         # log error, close socket, accept next connection
-        @logger.error("SSL Error", :exception => e, :backtrace => e.backtrace)
+        @logger.debug? && @logger.debug("SSL Error", :exception => e, :backtrace => e.backtrace)
       rescue => e
         # if this exception occured while the plugin is stopping
         # just ignore and exit
         raise e unless stop?
       end
@@ -209,10 +209,10 @@
     return @ssl_context if @ssl_context
 
     begin
       @ssl_context = OpenSSL::SSL::SSLContext.new
       @ssl_context.cert = OpenSSL::X509::Certificate.new(File.read(@ssl_cert))
-      @ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@ssl_key),@ssl_key_passphrase)
+      @ssl_context.key = OpenSSL::PKey::RSA.new(File.read(@ssl_key),@ssl_key_passphrase.value)
       if @ssl_verify
         @ssl_context.cert_store  = load_cert_store
         @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
       end
     rescue => e