From 67e8fe67adc13d2605b307da4532de78ac9d8372 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Sun, 1 Sep 2019 20:54:58 +0200 Subject: [PATCH] Improve output --- main.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/main.cpp b/main.cpp index 4297ce37..324c7fa4 100644 --- a/main.cpp +++ b/main.cpp @@ -5,34 +5,36 @@ #include int main(int argc, char *argv[]) { - fair::Logger::SetConsoleSeverity("debug"); + fair::Logger::SetConsoleSeverity("info"); + fair::Logger::DefineVerbosity( + "user1", fair::VerbositySpec::Make(fair::VerbositySpec::Info::timestamp_us, + fair::VerbositySpec::Info::severity)); + fair::Logger::SetVerbosity("user1"); + fair::Logger::SetConsoleColor(); // workaround https://github.com/FairRootGroup/DDS/issues/24 std::string path(std::getenv("PATH")); path = std::string("@FairMQ_BINDIR@:") + path; setenv("PATH", path.c_str(), 1); - LOG(debug) << "FairMQ " << FAIRMQ_GIT_VERSION << " build " - << FAIRMQ_BUILD_TYPE; + LOG(info) << "FairMQ " << FAIRMQ_GIT_VERSION << " build " + << FAIRMQ_BUILD_TYPE; fair::mq::sdk::DDSEnvironment ddsEnv; - LOG(debug) << ddsEnv; + LOG(info) << ddsEnv; fair::mq::sdk::DDSSession ddsSession(ddsEnv); ddsSession.StopOnDestruction(); - LOG(debug) << ddsSession; + LOG(info) << ddsSession; fair::mq::sdk::DDSTopology ddsTopo( "@FairMQ_DATADIR@/ex-dds-topology-infinite.xml", ddsEnv); - LOG(debug) << ddsTopo; + LOG(info) << ddsTopo; ddsSession.SubmitAgents(ddsTopo.GetNumRequiredAgents()); ddsSession.ActivateTopology(ddsTopo); - - for (const auto &ddsAgent : ddsSession.RequestAgentInfo()) { - LOG(debug) << ddsAgent; - } + auto ddsAgents(ddsSession.RequestAgentInfo()); fair::mq::sdk::Topology fairmqTopo(ddsTopo, ddsSession); @@ -57,5 +59,11 @@ int main(int argc, char *argv[]) { } } + LOG(info) << "DDS commander logs in " << ddsEnv.GetConfigHome() / ".DDS/log/sessions" / ddsSession.GetId(); + LOG(info) << "DDS agent logs in "; + for (const auto& ddsAgent : ddsAgents) { + LOG(info) << " " << ddsAgent.GetDDSPath(); + } + return 0; }