Merge lp:~brianaker/gearmand/ssl-update into lp:gearmand

[Brian Aker]

[lp:~brianaker/gearmand/ssl-update]

807. By Tangent.Org Continuous Integration on 2013-07-06

Merge lp:~brianaker/gearmand/ssl-update Build: jenkins-Gearmand-710

=== modified file 'libgearman-server/gearmand_con.cc'
--- libgearman-server/gearmand_con.cc	2013-06-26 23:50:02 +0000
+++ libgearman-server/gearmand_con.cc	2013-07-06 09:39:28 +0000
@@ -719,7 +719,9 @@
       gearmand_error_t rc;
       if ((rc= _con_add(thread, dcon)) != GEARMAND_SUCCESS)
       {
-        gearmand_gerror("_con_add() has failed, please report any crashes that occur immediatly after this.", rc);
+        gearmand_log_gerror(GEARMAN_DEFAULT_LOG_PARAM, rc, "%s:%s _con_add() has failed, please report any crashes that occur immediatly after this.",
+                            dcon->host,
+                            dcon->port);
         gearmand_con_free(dcon);
       }
     }
 
=== modified file 'libgearman-server/io.cc'
--- libgearman-server/io.cc	2013-07-06 00:33:10 +0000
+++ libgearman-server/io.cc	2013-07-06 09:39:28 +0000
@@ -99,6 +99,27 @@
   connection->recv_buffer_size= 0;
 }
 
+
+const char* gearmand_io_st::host() const
+{
+  if (context)
+  {
+    return context->host;
+  }
+
+  return "-";
+}
+
+const char* gearmand_io_st::port() const
+{
+  if (context)
+  {
+    return context->port;
+  }
+
+  return "-";
+}
+
 static size_t _connection_read(gearman_server_con_st *con, void *data, size_t data_size, gearmand_error_t &ret)
 {
   ssize_t read_size;
 
=== modified file 'libgearman-server/plugins/protocol/gear/protocol.cc'
--- libgearman-server/plugins/protocol/gear/protocol.cc	2013-07-06 00:33:10 +0000
+++ libgearman-server/plugins/protocol/gear/protocol.cc	2013-07-06 09:39:28 +0000
@@ -317,21 +317,17 @@
 
     CyaSSL_set_fd(connection->_ssl, connection->con.fd);
 
-    bool connecting= true;
-    while (connecting)
+    if (CyaSSL_accept(connection->_ssl) != SSL_SUCCESS)
     {
-      if (CyaSSL_accept(connection->_ssl) == SSL_SUCCESS)
-      {
-        connecting= false;
-        break;
-      }
-
       if (CyaSSL_get_error(connection->_ssl, 0) != SSL_ERROR_WANT_READ)
       {
         int cyassl_error= CyaSSL_get_error(connection->_ssl, 0);
         char cyassl_error_buffer[1024]= { 0 };
         CyaSSL_ERR_error_string(cyassl_error, cyassl_error_buffer);
-        return gearmand_log_gerror(GEARMAN_DEFAULT_LOG_PARAM, GEARMAND_LOST_CONNECTION, "%s(%d)", cyassl_error_buffer, cyassl_error);
+        return gearmand_log_gerror(GEARMAN_DEFAULT_LOG_PARAM, GEARMAND_LOST_CONNECTION, "%s:%s %s(%d)", 
+                                   connection->host(),
+                                   connection->port(),
+                                   cyassl_error_buffer, cyassl_error);
       }
     }
     gearmand_log_info(GEARMAN_DEFAULT_LOG_PARAM, "GearSSL connection made: %d", connection->con.fd);
 
=== modified file 'libgearman-server/struct/io.h'
--- libgearman-server/struct/io.h	2013-06-26 23:50:02 +0000
+++ libgearman-server/struct/io.h	2013-07-06 09:39:28 +0000
@@ -94,6 +94,9 @@
   char recv_buffer[GEARMAND_RECV_BUFFER_SIZE];
 
   gearmand_io_st() { }
+
+  const char* host() const;
+  const char* port() const;
 };
 
 namespace gearmand { namespace protocol {class Context; } }
@@ -151,6 +154,26 @@
   {
   }
 
+  const char* host() const
+  {
+    if (_host)
+    {
+      return _host;
+    }
+
+    return "-";
+  }
+
+  const char* port() const
+  {
+    if (_port)
+    {
+      return _port;
+    }
+
+    return "-";
+  }
+
   void set_protocol(gearmand::protocol::Context* arg)
   {
     protocol= arg;
 
=== modified file 'tests/libgearman-1.0/gearman_execute_partition.cc'
--- tests/libgearman-1.0/gearman_execute_partition.cc	2013-03-29 07:43:50 +0000
+++ tests/libgearman-1.0/gearman_execute_partition.cc	2013-07-06 09:39:28 +0000
@@ -127,6 +127,7 @@
 test_return_t gearman_execute_partition_basic(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
+  ASSERT_TRUE(client);
 
   ASSERT_EQ(GEARMAN_SUCCESS,
                gearman_client_echo(client, test_literal_param("this is mine")));