making public DEFAULT_SOCKET_TIMEOUT_MSEC and changing the name to match MONGOC_DEFAULT_CONNECTTIMEOUTMS

Closes #95

Author: Jérôme Lebel

src/mongoc/mongoc-client.h

@@ -49,6 +49,19 @@ BSON_BEGIN_DECLS
 #endif
 
 
+#ifndef MONGOC_DEFAULT_SOCKETTIMEOUTMS
+/*
+ * NOTE: The default socket timeout for connections is 5 minutes. This
+ *       means that if your MongoDB server dies or becomes unavailable
+ *       it will take 5 minutes to detect this.
+ *
+ *       You can change this by providing sockettimeoutms= in your
+ *       connection URI.
+ */
+#define MONGOC_DEFAULT_SOCKETTIMEOUTMS (1000L * 60L * 5L)
+#endif
+
+
 /**
  * mongoc_client_t:
  *

src/mongoc/mongoc-cluster.c

@@ -66,19 +66,6 @@
 #define CHECK_CLOSED_DURATION_MSEC 1000
 
 
-#ifndef DEFAULT_SOCKET_TIMEOUT_MSEC
-/*
- * NOTE: The default socket timeout for connections is 5 minutes. This
- *       means that if your MongoDB server dies or becomes unavailable
- *       it will take 5 minutes to detect this.
- *
- *       You can change this by providing sockettimeoutms= in your
- *       connection URI.
- */
-#define DEFAULT_SOCKET_TIMEOUT_MSEC (1000L * 60L * 5L)
-#endif
-
-
 #ifndef UNHEALTHY_RECONNECT_TIMEOUT_USEC
 /*
  * Try reconnect every 20 seconds if we are unhealthy.
@@ -484,7 +471,7 @@ _mongoc_cluster_init (mongoc_cluster_t   *cluster,
 {
    const mongoc_host_list_t *hosts;
    const mongoc_host_list_t *host_iter;
-   uint32_t sockettimeoutms = DEFAULT_SOCKET_TIMEOUT_MSEC;
+   uint32_t sockettimeoutms = MONGOC_DEFAULT_SOCKETTIMEOUTMS;
    uint32_t i;
    const bson_t *b;
    bson_iter_t iter;
@@ -513,7 +500,7 @@ _mongoc_cluster_init (mongoc_cluster_t   *cluster,
 
    if (bson_iter_init_find_case(&iter, b, "sockettimeoutms")) {
       if (!(sockettimeoutms = bson_iter_int32 (&iter))) {
-         sockettimeoutms = DEFAULT_SOCKET_TIMEOUT_MSEC;
+         sockettimeoutms = MONGOC_DEFAULT_SOCKETTIMEOUTMS;
       }
    }