CDRIVER-900: Print debug error messaging to stderr

bjori · bjori · commit c86e5d2b8412 · 2015-10-02T09:18:08.000-07:00
diff --git a/tests/ha-test.c b/tests/ha-test.c
@@ -789,7 +789,7 @@ ha_replica_set_wait_for_healthy (ha_replica_set_t *replica_set)
       char *str;
 
       str = bson_as_json(&status, NULL);
-      printf("%s\n", str);
+      fprintf(stderr, "%s\n", str);
       bson_free(str);
    }
 #endif
@@ -952,7 +952,7 @@ ha_config_add_shard (ha_node_t        *node,
       char *str;
 
       str = bson_as_json (&reply, NULL);
-      printf ("%s\n", str);
+      fprintf (stderr, "%s\n", str);
       bson_free (str);
    }
 #endif
diff --git a/tests/json-test.c b/tests/json-test.c
@@ -37,7 +37,7 @@ topology_type_from_test(const char *type)
    } else if (strcmp(type, "Sharded") == 0) {
       return MONGOC_TOPOLOGY_SHARDED;
    } else {
-      printf("can't parse this: %s", type);
+      fprintf(stderr, "can't parse this: %s", type);
       assert(0);
    }
 }
@@ -64,7 +64,7 @@ server_type_from_test(const char *type)
    } else if (strcmp(type, "Unknown") == 0) {
       return MONGOC_SERVER_UNKNOWN;
    } else {
-      printf("ERROR: Unknown server type %s\n", type);
+      fprintf(stderr, "ERROR: Unknown server type %s\n", type);
       assert(0);
    }
 }
@@ -85,7 +85,7 @@ topology_type_to_string(mongoc_topology_description_type_t type)
       return "Single";
    case MONGOC_TOPOLOGY_DESCRIPTION_TYPES:
    default:
-      printf("ERROR: Unknown topology state\n");
+      fprintf(stderr, "ERROR: Unknown topology state\n");
       assert(0);
    }
 }
@@ -296,7 +296,7 @@ install_json_test_suite(TestSuite *suite, const char *dir_path, test_hook callba
 
          TestSuite_AddWC(suite, skip_json, (void (*)(void *))callback, (void (*)(void*))bson_destroy, test);
       } else {
-         printf("NO DATA\n");
+         fprintf(stderr, "NO DATA\n");
       }
    }
 }
diff --git a/tests/mock_server/mock-server.c b/tests/mock_server/mock-server.c
@@ -311,7 +311,7 @@ mock_server_run (mock_server_t *server)
    mongoc_mutex_unlock (&server->mutex);
 
    if (mock_server_get_verbose (server)) {
-      printf ("listening on port %hu\n", bound_port);
+      fprintf (stderr, "listening on port %hu\n", bound_port);
       fflush (stdout);
    }
 
diff --git a/tests/test-bulk.c b/tests/test-bulk.c
@@ -2476,7 +2476,7 @@ test_bulk_write_concern_over_1000(void)
     success = mongoc_cursor_next (cursor, &result);
     if (!success) {
        mongoc_cursor_error(cursor, &error);
-       printf("%s", error.message);
+       fprintf(stderr, "%s", error.message);
     }
     assert(success);
 
diff --git a/tests/test-libmongoc.c b/tests/test-libmongoc.c
@@ -514,8 +514,8 @@ call_ismaster (bson_t *reply)
                                       tmp_bson ("{'isMaster': 1}"),
                                       NULL, reply, &error)) {
 
-      printf ("error calling ismaster: '%s'\n", error.message);
-      printf ("URI = %s\n", uri_str);
+      fprintf (stderr, "error calling ismaster: '%s'\n", error.message);
+      fprintf (stderr, "URI = %s\n", uri_str);
       abort ();
    }
 
diff --git a/tests/test-mongoc-client.c b/tests/test-mongoc-client.c
@@ -103,7 +103,7 @@ test_mongoc_client_authenticate (void *context)
    if (!r) {
       r = mongoc_cursor_error(cursor, &error);
       if (r) {
-         printf("Authentication failure: \"%s\"", error.message);
+         fprintf (stderr, "Authentication failure: \"%s\"", error.message);
       }
       assert(!r);
    }
diff --git a/tests/test-mongoc-exhaust.c b/tests/test-mongoc-exhaust.c
@@ -136,7 +136,7 @@ test_exhaust_cursor (bool pooled)
       r = mongoc_cursor_next (cursor, &doc);
       if (!r) {
          mongoc_cursor_error (cursor, &error);
-         printf ("cursor error: %s\n", error.message);
+         fprintf (stderr, "cursor error: %s\n", error.message);
       }
       assert (r);
       assert (doc);
@@ -159,7 +159,7 @@ test_exhaust_cursor (bool pooled)
       r = mongoc_cursor_next (cursor2, &doc);
       if (!r) {
          mongoc_cursor_error (cursor2, &error);
-         printf ("cursor error: %s\n", error.message);
+         fprintf (stderr, "cursor error: %s\n", error.message);
       }
       assert (r);
       assert (doc);
@@ -169,7 +169,7 @@ test_exhaust_cursor (bool pooled)
          r = mongoc_cursor_next (cursor2, &doc);
          if (!r) {
             mongoc_cursor_error (cursor2, &error);
-            printf ("cursor error: %s\n", error.message);
+            fprintf (stderr, "cursor error: %s\n", error.message);
          }
          assert (r);
          assert (doc);
diff --git a/tests/test-mongoc-matcher.c b/tests/test-mongoc-matcher.c
@@ -40,7 +40,7 @@ test_mongoc_matcher_basic (void)
 #if 0
    {
       char *out = bson_as_json(&matcher_query, NULL);
-      printf("bson: %s\n", out);
+      fprintf(stderr, "bson: %s\n", out);
       free(out);
    }
 #endif
diff --git a/tests/test-mongoc-rpc.c b/tests/test-mongoc-rpc.c
@@ -71,16 +71,16 @@ assert_rpc_equal (const char   *filename,
    _mongoc_rpc_gather(rpc, &ar);
 
 #if 0
-   printf("Before swabbing\n");
-   printf("=========================\n");
+   fprintf(stderr, "Before swabbing\n");
+   fprintf(stderr, "=========================\n");
    mongoc_rpc_printf(rpc);
 #endif
 
    _mongoc_rpc_swab_to_le(rpc);
 
 #if 0
-   printf("After swabbing\n");
-   printf("=========================\n");
+   fprintf(stderr, "After swabbing\n");
+   fprintf(stderr, "=========================\n");
    mongoc_rpc_printf(rpc);
 #endif
 
@@ -89,7 +89,7 @@ assert_rpc_equal (const char   *filename,
       ASSERT(iov->iov_len <= (length - off));
       r = memcmp(&data[off], iov->iov_base, iov->iov_len);
       if (r) {
-         printf("\nError iovec: %u\n", i);
+         fprintf(stderr, "\nError iovec: %u\n", i);
       }
       ASSERT(r == 0);
       off += iov->iov_len;
diff --git a/tests/test-mongoc-sdam.c b/tests/test-mongoc-sdam.c
@@ -60,7 +60,7 @@ _topology_has_description(mongoc_topology_description_t *topology,
       } else if (strcmp("type", bson_iter_key (&server_iter)) == 0) {
          assert (sd->type == server_type_from_test(bson_iter_utf8(&server_iter, NULL)));
       } else {
-         printf ("ERROR: unparsed field %s\n", bson_iter_key(&server_iter));
+         fprintf (stderr, "ERROR: unparsed field %s\n", bson_iter_key(&server_iter));
          assert (0);
       }
    }
@@ -172,7 +172,7 @@ test_sdam_cb (bson_t *test)
                topology_type_to_string(client->topology->description.type),
                bson_iter_utf8(&outcome_iter, NULL));
          } else {
-            printf ("ERROR: unparsed test field %s\n", bson_iter_key (&outcome_iter));
+            fprintf (stderr, "ERROR: unparsed test field %s\n", bson_iter_key (&outcome_iter));
             assert (false);
          }
       }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ topology_type_from_test(const char *type)`
`37`	`37`	`} else if (strcmp(type, "Sharded") == 0) {`
`38`	`38`	`return MONGOC_TOPOLOGY_SHARDED;`
`39`	`39`	`} else {`
`40`		`- printf("can't parse this: %s", type);`
	`40`	`+ fprintf(stderr, "can't parse this: %s", type);`
`41`	`41`	`assert(0);`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -64,7 +64,7 @@ server_type_from_test(const char *type)`
`64`	`64`	`} else if (strcmp(type, "Unknown") == 0) {`
`65`	`65`	`return MONGOC_SERVER_UNKNOWN;`
`66`	`66`	`} else {`
`67`		`- printf("ERROR: Unknown server type %s\n", type);`
	`67`	`+ fprintf(stderr, "ERROR: Unknown server type %s\n", type);`
`68`	`68`	`assert(0);`
`69`	`69`	`}`
`70`	`70`	`}`
`@@ -85,7 +85,7 @@ topology_type_to_string(mongoc_topology_description_type_t type)`
`85`	`85`	`return "Single";`
`86`	`86`	`case MONGOC_TOPOLOGY_DESCRIPTION_TYPES:`
`87`	`87`	`default:`
`88`		`- printf("ERROR: Unknown topology state\n");`
	`88`	`+ fprintf(stderr, "ERROR: Unknown topology state\n");`
`89`	`89`	`assert(0);`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -296,7 +296,7 @@ install_json_test_suite(TestSuite suite, const char dir_path, test_hook callba`
`296`	`296`
`297`	`297`	`TestSuite_AddWC(suite, skip_json, (void ()(void ))callback, (void ()(void))bson_destroy, test);`
`298`	`298`	`} else {`
`299`		`- printf("NO DATA\n");`
	`299`	`+ fprintf(stderr, "NO DATA\n");`
`300`	`300`	`}`
`301`	`301`	`}`
`302`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ mock_server_run (mock_server_t *server)`
`311`	`311`	`mongoc_mutex_unlock (&server->mutex);`
`312`	`312`
`313`	`313`	`if (mock_server_get_verbose (server)) {`
`314`		`- printf ("listening on port %hu\n", bound_port);`
	`314`	`+ fprintf (stderr, "listening on port %hu\n", bound_port);`
`315`	`315`	`fflush (stdout);`
`316`	`316`	`}`
`317`	`317`
Original file line number	Diff line number	Diff line change
`@@ -2476,7 +2476,7 @@ test_bulk_write_concern_over_1000(void)`
`2476`	`2476`	`success = mongoc_cursor_next (cursor, &result);`
`2477`	`2477`	`if (!success) {`
`2478`	`2478`	`mongoc_cursor_error(cursor, &error);`
`2479`		`- printf("%s", error.message);`
	`2479`	`+ fprintf(stderr, "%s", error.message);`
`2480`	`2480`	`}`
`2481`	`2481`	`assert(success);`
`2482`	`2482`
Original file line number	Diff line number	Diff line change
`@@ -514,8 +514,8 @@ call_ismaster (bson_t *reply)`
`514`	`514`	`tmp_bson ("{'isMaster': 1}"),`
`515`	`515`	`NULL, reply, &error)) {`
`516`	`516`
`517`		`- printf ("error calling ismaster: '%s'\n", error.message);`
`518`		`- printf ("URI = %s\n", uri_str);`
	`517`	`+ fprintf (stderr, "error calling ismaster: '%s'\n", error.message);`
	`518`	`+ fprintf (stderr, "URI = %s\n", uri_str);`
`519`	`519`	`abort ();`
`520`	`520`	`}`
`521`	`521`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ test_mongoc_client_authenticate (void *context)`
`103`	`103`	`if (!r) {`
`104`	`104`	`r = mongoc_cursor_error(cursor, &error);`
`105`	`105`	`if (r) {`
`106`		`- printf("Authentication failure: \"%s\"", error.message);`
	`106`	`+ fprintf (stderr, "Authentication failure: \"%s\"", error.message);`
`107`	`107`	`}`
`108`	`108`	`assert(!r);`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ test_mongoc_matcher_basic (void)`
`40`	`40`	`#if 0`
`41`	`41`	`{`
`42`	`42`	`char *out = bson_as_json(&matcher_query, NULL);`
`43`		`- printf("bson: %s\n", out);`
	`43`	`+ fprintf(stderr, "bson: %s\n", out);`
`44`	`44`	`free(out);`
`45`	`45`	`}`
`46`	`46`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ _topology_has_description(mongoc_topology_description_t *topology,`
`60`	`60`	`} else if (strcmp("type", bson_iter_key (&server_iter)) == 0) {`
`61`	`61`	`assert (sd->type == server_type_from_test(bson_iter_utf8(&server_iter, NULL)));`
`62`	`62`	`} else {`
`63`		`- printf ("ERROR: unparsed field %s\n", bson_iter_key(&server_iter));`
	`63`	`+ fprintf (stderr, "ERROR: unparsed field %s\n", bson_iter_key(&server_iter));`
`64`	`64`	`assert (0);`
`65`	`65`	`}`
`66`	`66`	`}`
`@@ -172,7 +172,7 @@ test_sdam_cb (bson_t *test)`
`172`	`172`	`topology_type_to_string(client->topology->description.type),`
`173`	`173`	`bson_iter_utf8(&outcome_iter, NULL));`
`174`	`174`	`} else {`
`175`		`- printf ("ERROR: unparsed test field %s\n", bson_iter_key (&outcome_iter));`
	`175`	`+ fprintf (stderr, "ERROR: unparsed test field %s\n", bson_iter_key (&outcome_iter));`
`176`	`176`	`assert (false);`
`177`	`177`	`}`
`178`	`178`	`}`