diff --git a/src/ClientConfig_TEST.cc b/src/ClientConfig_TEST.cc index 6286b864..d1f3ef4f 100644 --- a/src/ClientConfig_TEST.cc +++ b/src/ClientConfig_TEST.cc @@ -306,7 +306,7 @@ TEST(ClientConfig, AsString) ClientConfig client; std::string str = client.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; #ifndef _WIN32 EXPECT_NE(str.find(".ignition/fuel"), std::string::npos); @@ -337,7 +337,7 @@ TEST(ClientConfig, AsString) srv.SetApiKey("ABCD"); auto str = srv.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); EXPECT_EQ(str.find("local_name"), std::string::npos); @@ -354,7 +354,7 @@ TEST(ClientConfig, AsString) client.AddServer(srv); auto str = client.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("cache/location"), std::string::npos); EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); @@ -380,7 +380,7 @@ TEST(ClientConfig, AsPrettyString) srv.SetApiKey("ABCD"); auto str = srv.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("http://serverurl.com"), std::string::npos); EXPECT_EQ(str.find("local_name"), std::string::npos); diff --git a/src/FuelClient.cc b/src/FuelClient.cc index 06ea618a..a38a5670 100644 --- a/src/FuelClient.cc +++ b/src/FuelClient.cc @@ -920,7 +920,7 @@ std::vector FuelClient::DownloadModels( if (!dependencies.empty()) { std::lock_guard lock(idsMutex); - igndbg << "Adding " << dependencies.size() + gzdbg << "Adding " << dependencies.size() << " model dependencies to queue from " << id.Name() << "\n"; for (auto dep : dependencies) { @@ -1653,7 +1653,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, { std::string filePath = common::joinPaths(_pathToModelDir, "metadata.pbtxt"); - igndbg << "Parsing " << filePath << std::endl; + gzdbg << "Parsing " << filePath << std::endl; // Read the pbtxt file. std::ifstream inputFile(filePath); @@ -1667,7 +1667,7 @@ bool FuelClientPrivate::FillModelForm(const std::string &_pathToModelDir, { std::string filePath = common::joinPaths(_pathToModelDir, "model.config"); - igndbg << "Parsing " << filePath << std::endl; + gzdbg << "Parsing " << filePath << std::endl; std::ifstream inputFile(filePath); std::string inputStr((std::istreambuf_iterator(inputFile)), diff --git a/src/FuelClient_TEST.cc b/src/FuelClient_TEST.cc index e74287b1..0354d0b4 100644 --- a/src/FuelClient_TEST.cc +++ b/src/FuelClient_TEST.cc @@ -45,7 +45,7 @@ using namespace gz::fuel_tools; /// Taken from LocalCache_TEST void createLocalModel(ClientConfig &_conf) { - igndbg << "Creating local model in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating local model in [" << common::cwd() << "]" << std::endl; auto modelPath = common::joinPaths( "test_cache", "localhost:8007", "alice", "models", "My Model"); @@ -100,7 +100,7 @@ void createLocalModel(ClientConfig &_conf) /// Taken from LocalCache_TEST void createLocalWorld(ClientConfig &_conf) { - igndbg << "Creating local world in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating local world in [" << common::cwd() << "]" << std::endl; auto worldPath = common::joinPaths( "test_cache", "localhost:8007", "banana", "worlds", "My World"); diff --git a/src/LocalCache.cc b/src/LocalCache.cc index 91e43cfc..69609f2f 100644 --- a/src/LocalCache.cc +++ b/src/LocalCache.cc @@ -601,7 +601,7 @@ void LocalCachePrivate::FixPathsInUri(tinyxml2::XMLElement *_elem, // On Blueprint and Citadel, just warn the user // From Dome, use the name on the URI (resourceName) and assume the same // owner - igndbg << "Model [" << _id.Name() + gzdbg << "Model [" << _id.Name() << "] loading resource from another model, named [" << resourceName << "]. On Blueprint (ign-fuel-tools 3) and Citadel " << "(ign-fuel-tools 4), [" << resourceName << "] is ignored. " diff --git a/src/LocalCache_TEST.cc b/src/LocalCache_TEST.cc index 4c2b64b0..41b2a801 100644 --- a/src/LocalCache_TEST.cc +++ b/src/LocalCache_TEST.cc @@ -44,7 +44,7 @@ using namespace fuel_tools; /// \brief Creates a directory structure in the build directory with 6 models void createLocal6Models(ClientConfig &_conf) { - igndbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 6 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -96,7 +96,7 @@ void createLocal6Models(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 3 models void createLocal3Models(ClientConfig &_conf) { - igndbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 3 local models in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -130,7 +130,7 @@ void createLocal3Models(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 6 worlds void createLocal6Worlds(ClientConfig &_conf) { - igndbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 6 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8001"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, @@ -182,7 +182,7 @@ void createLocal6Worlds(ClientConfig &_conf) /// \brief Creates a directory structure in the build directory with 3 worlds void createLocal3Worlds(ClientConfig &_conf) { - igndbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl; + gzdbg << "Creating 3 local worlds in [" << common::cwd() << "]" << std::endl; auto serverPath = common::joinPaths("test_cache", "localhost:8007"); ASSERT_TRUE(common::createDirectories(common::joinPaths(serverPath, diff --git a/src/ModelIdentifier_TEST.cc b/src/ModelIdentifier_TEST.cc index f316af09..85e28f6d 100644 --- a/src/ModelIdentifier_TEST.cc +++ b/src/ModelIdentifier_TEST.cc @@ -183,7 +183,7 @@ TEST(ModelIdentifier, AsString) id.SetUploadDate(d2); auto str = id.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); @@ -219,7 +219,7 @@ TEST(ModelIdentifier, AsPrettyString) id.SetUploadDate(d2); auto str = id.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); diff --git a/src/ModelIter.cc b/src/ModelIter.cc index c0cd3fdc..8829899b 100644 --- a/src/ModelIter.cc +++ b/src/ModelIter.cc @@ -199,7 +199,7 @@ IterRestIds::IterRestIds(const Rest &_rest, const ServerConfig &_config, ptr->id.SetServer(this->config); this->model = Model(ptr); - igndbg << "Got response [" << resp.data << "]\n"; + gzdbg << "Got response [" << resp.data << "]\n"; } ////////////////////////////////////////////////// diff --git a/src/WorldIdentifier_TEST.cc b/src/WorldIdentifier_TEST.cc index 54c583c2..0a9c3571 100644 --- a/src/WorldIdentifier_TEST.cc +++ b/src/WorldIdentifier_TEST.cc @@ -148,7 +148,7 @@ TEST(WorldIdentifier, AsString) id.SetVersionStr("55"); auto str = id.AsString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); @@ -176,7 +176,7 @@ TEST(WorldIdentifier, AsPrettyString) id.SetVersionStr("55"); auto str = id.AsPrettyString(); - igndbg << str << std::endl; + gzdbg << str << std::endl; EXPECT_NE(str.find("hello"), std::string::npos); EXPECT_NE(str.find("raspberry"), std::string::npos); diff --git a/src/WorldIter.cc b/src/WorldIter.cc index 980f34a4..904e5ac2 100644 --- a/src/WorldIter.cc +++ b/src/WorldIter.cc @@ -166,7 +166,7 @@ WorldIterRestIds::WorldIterRestIds(const Rest &_rest, this->worldId = *(this->idIter); this->worldId.SetServer(this->config); - igndbg << "Got response [" << resp.data << "]\n"; + gzdbg << "Got response [" << resp.data << "]\n"; } ////////////////////////////////////////////////// diff --git a/src/Zip.cc b/src/Zip.cc index e90357a3..dcdd1bfa 100644 --- a/src/Zip.cc +++ b/src/Zip.cc @@ -170,7 +170,7 @@ bool Zip::Extract(const std::string &_src, else file.write(buf, len); - igndbg << "Created file [" << dst << "]" << std::endl; + gzdbg << "Created file [" << dst << "]" << std::endl; delete[] buf; file.close();