diff --git a/src/multio/config/MultioConfiguration.cc b/src/multio/config/MultioConfiguration.cc index 68c15be6e..fe60e9c67 100644 --- a/src/multio/config/MultioConfiguration.cc +++ b/src/multio/config/MultioConfiguration.cc @@ -4,7 +4,8 @@ #include "multio/config/MetadataMappings.h" #include "multio/config/MultioConfiguration.h" - +#include "eckit/log/Log.h" +#include "multio/LibMultio.h" #include "multio/util/Environment.h" #include "multio/util/Substitution.h" @@ -61,14 +62,14 @@ ConfigAndPaths configureFromEnv(config::LocalPeerTag tag) { if (::getenv("MULTIO_PLANS")) { std::string cfg(::getenv("MULTIO_PLANS")); - std::cout << "MultIO initialising with plans " << cfg << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with plans " << cfg << std::endl; paths.configDir = ""; return ConfigAndPaths{paths, eckit::LocalConfiguration{eckit::YAMLConfiguration(cfg)}}; } if (::getenv("MULTIO_PLANS_FILE")) { eckit::PathName filePath(::getenv("MULTIO_PLANS_FILE")); - std::cout << "MultIO initialising with plans file " << filePath << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with plans file " << filePath << std::endl; auto paths2 = defaultConfigPaths(filePath); return ConfigAndPaths{paths2, eckit::LocalConfiguration{eckit::YAMLConfiguration{paths2.configDir}}}; @@ -77,14 +78,14 @@ ConfigAndPaths configureFromEnv(config::LocalPeerTag tag) { // IFS Legacy if (::getenv("MULTIO_CONFIG")) { std::string cfg(::getenv("MULTIO_CONFIG")); - std::cout << "MultIO initialising with config " << cfg << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with config " << cfg << std::endl; paths.configDir = ""; return ConfigAndPaths{paths, configureFromSinks(eckit::LocalConfiguration{eckit::YAMLConfiguration(cfg)})}; } if (::getenv("MULTIO_CONFIG_FILE")) { eckit::PathName filePath(::getenv("MULTIO_CONFIG_FILE")); - std::cout << "MultIO initialising with config file " << filePath << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with config file " << filePath << std::endl; auto paths2 = defaultConfigPaths(filePath); return ConfigAndPaths{ @@ -110,7 +111,7 @@ ConfigAndPaths configureFromEnv(config::LocalPeerTag tag) { } oss << "] }"; - std::cout << "MultIO initialising with $MULTIO_SINKS " << oss.str() << std::endl; + LOG_DEBUG_LIB(multio::LibMultio) << "MultIO initialising with $MULTIO_SINKS " << oss.str() << std::endl; std::istringstream iss(oss.str()); paths.configDir = ""; diff --git a/src/multio/ifsio/ifsio.cc b/src/multio/ifsio/ifsio.cc index a58dcce0c..6e67c5cd4 100644 --- a/src/multio/ifsio/ifsio.cc +++ b/src/multio/ifsio/ifsio.cc @@ -22,6 +22,7 @@ #include "eckit/config/YAMLConfiguration.h" #include "eckit/exception/Exceptions.h" #include "eckit/filesystem/PathName.h" +#include "eckit/log/Log.h" #include "eckit/message/Message.h" #include "eckit/runtime/Main.h" #include "eckit/thread/AutoLock.h" @@ -34,6 +35,7 @@ #include "multio/multio_version.h" #include "multio/util/FailureHandling.h" // #include "multio/action/Sink.h" + #include "multio/LibMultio.h" #include "metkit/codes/CodesContent.h" @@ -146,28 +148,28 @@ class MIO : public config::MultioConfigurationHolder, public util::FailureAware< if (::getenv("MULTIO_PLANS")) { std::string cfg(::getenv("MULTIO_PLANS")); - std::cout << "MultIO initialising with plans " << cfg << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with plans " << cfg << std::endl; eckit::LocalConfiguration conf{eckit::YAMLConfiguration(cfg)}; return std::make_tuple(conf, MultioConfiguration(conf, config::LocalPeerTag::Client)); } if (::getenv("MULTIO_PLANS_FILE")) { PathName path(::getenv("MULTIO_PLANS_FILE")); - std::cout << "MultIO initialising with plans file " << path << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with plans file " << path << std::endl; MultioConfiguration multioConf(path, config::LocalPeerTag::Client); return std::make_tuple(multioConf.parsedConfig(), std::move(multioConf)); } if (::getenv("MULTIO_CONFIG")) { std::string cfg(::getenv("MULTIO_CONFIG")); - std::cout << "MultIO initialising with config " << cfg << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with config " << cfg << std::endl; return configureFromSinks(MultioConfiguration(eckit::LocalConfiguration(eckit::YAMLConfiguration(cfg)), config::LocalPeerTag::Client)); } if (::getenv("MULTIO_CONFIG_FILE")) { PathName filePath(::getenv("MULTIO_CONFIG_FILE")); - std::cout << "MultIO initialising with config file " << filePath << std::endl; + LOG_DEBUG_LIB(LibMultio) << "MultIO initialising with config file " << filePath << std::endl; return configureFromSinks(MultioConfiguration(filePath, config::LocalPeerTag::Client)); }