Commit ce3c751a authored by Martin Vala's avatar Martin Vala Committed by Branislav Beke

Resolve "Silent logs to minimum"

parent 7f454bcf
......@@ -25,8 +25,8 @@ void Actor::signalHandler(int signalNumber)
///
interrupted(signalNumber);
SPD_DEBUG("Interrupted with signal [{}]", msInterrupted);
SPD_INFO("Shutting down...");
SPD_TRACE("Interrupted with signal [{}]", msInterrupted);
SPD_TRACE("Shutting down...");
}
} // namespace Salsa
......@@ -116,7 +116,7 @@ void HyperCube::print() const
{
s.append(std::to_string(_adjMatrix[i][j]));
}
SPD_INFO("{}", s);
SPD_TRACE("{}", s);
}
for (std::size_t i = 0; i < _paths.size(); ++i)
......@@ -126,7 +126,7 @@ void HyperCube::print() const
{
s.append(std::to_string(_paths[i][j]) + " ");
}
SPD_INFO("{}", s);
SPD_TRACE("{}", s);
}
}
} // namespace Salsa
......
......@@ -10,7 +10,7 @@ Node::Node(std::string newName, std::string uuid)
///
/// Constructor
///
SPD_DEBUG("Constructing node name [{}] UUID [{}]", mName, mUUID);
SPD_TRACE("Constructing node name [{}] UUID [{}]", mName, mUUID);
}
Node::~Node()
......@@ -100,7 +100,7 @@ void Node::print() const
{
}
SPD_DEBUG("Node::print() : name [{}] nodes [{}] publishers [{}] this [{}] parent [{}]",
SPD_TRACE("Node::print() : name [{}] nodes [{}] publishers [{}] this [{}] parent [{}]",
mName,
mChildNodes.size(),
mPublishers.size(),
......@@ -182,11 +182,11 @@ void Node::publish()
if (pNode->publishers().empty())
{
SPD_DEBUG("Node::publish() No publisher defined! Aborting publish()");
SPD_TRACE("Node::publish() No publisher defined! Aborting publish()");
return;
}
SPD_DEBUG(
SPD_TRACE(
"Node::publish() Publishing from [{}] nPublishers [{}]", pNode->name(), mPublishers.size());
Json::Value jsonData;
......@@ -198,7 +198,7 @@ void Node::publish()
for (auto const & pub : pNode->publishers())
{
SPD_DEBUG("Node::publish() name [{}] data [{}]", pNode->name(), outStr);
SPD_TRACE("Node::publish() name [{}] data [{}]", pNode->name(), outStr);
pub->publish(pNode->name(), outStr);
}
}
......
......@@ -9,17 +9,17 @@ Packetizer::Packetizer(EType type)
: Object()
, mcNodeType(type)
{
SPD_INFO("Packetizer - DISREGARD FOLLOWING");
SPD_TRACE("Packetizer - DISREGARD FOLLOWING");
switch (mcNodeType)
{
case master:
SPD_INFO("Running Packetizer [type=MASTER]");
SPD_TRACE("Running Packetizer [type=MASTER]");
break;
case worker:
SPD_INFO("Running Packetizer [type=WORKER]");
SPD_TRACE("Running Packetizer [type=WORKER]");
break;
case none:
SPD_INFO("No packetizer. You shouldn't see this.");
SPD_TRACE("No packetizer. You shouldn't see this.");
}
}
......
......@@ -23,6 +23,14 @@ configure_file (
# add the binary tree to the search path for include files
include_directories("${PROJECT_BINARY_DIR}")
# Getting just filename for logging
if (CMAKE_GENERATOR STREQUAL "Ninja")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILENAME__=__FILE__")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__FILENAME__='\"$(notdir $(abspath $<))\"'")
endif()
# Setting libdir
set(CMAKE_INSTALL_LIBDIR lib64)
set(CPACK_SOURCE_GENERATOR "TGZ")
......
......@@ -19,11 +19,11 @@
#define SALSA_INT_N_PROXY_(str) #str
#define SALSA_INT_N_(str) SALSA_INT_N_PROXY_(str)
#define SPD_TRACE(...) ::Salsa::Object::get_console_output()->trace(__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_DEBUG(...) ::Salsa::Object::get_console_output()->debug(__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_INFO(...) ::Salsa::Object::get_console_output()->info (__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_WARN(...) ::Salsa::Object::get_console_output()->warn (__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_ERROR(...) ::Salsa::Object::get_console_output()->error(__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_CRIT(...) ::Salsa::Object::get_console_output()->critical(__FILE__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_TRACE(...) ::Salsa::Object::get_console_output()->trace(__FILENAME__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_DEBUG(...) ::Salsa::Object::get_console_output()->debug(__FILENAME__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_INFO(...) ::Salsa::Object::get_console_output()->info (__VA_ARGS__)
#define SPD_WARN(...) ::Salsa::Object::get_console_output()->warn (__FILENAME__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_ERROR(...) ::Salsa::Object::get_console_output()->error(__FILENAME__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#define SPD_CRIT(...) ::Salsa::Object::get_console_output()->critical(__FILENAME__ ":" SALSA_INT_N_(__LINE__) ": " __VA_ARGS__)
#pragma clang diagnostic pop
......@@ -12,12 +12,12 @@ int main(int argc, char ** argv)
std::ifstream ifs(argv[1]);
std::shared_ptr<spdlog::logger> logger = spdlog::stdout_logger_mt("console");
SPD_INFO("Running Exec client...");
SPD_TRACE("Running Exec client...");
zsock_t * dealer = zsock_new_dealer(">tcp://localhost:5555");
if (dealer == nullptr)
{
SPD_INFO("Failed to create dealer!");
SPD_TRACE("Failed to create dealer!");
return 2;
}
......@@ -28,12 +28,12 @@ int main(int argc, char ** argv)
std::getline(ifs, command);
if (command.empty())
continue;
SPD_INFO("[ID {:016X}][{}]", id++, command);
SPD_TRACE("[ID {:016X}][{}]", id++, command);
zstr_send(dealer, command.c_str());
zclock_sleep(50);
} while (!zsys_interrupted && !command.empty());
SPD_INFO("----- Sent [{}] jobs -----", id);
SPD_INFO("Destroying and exiting...");
SPD_TRACE("----- Sent [{}] jobs -----", id);
SPD_TRACE("Destroying and exiting...");
zsock_destroy(&dealer);
......
......@@ -26,7 +26,7 @@ static void mkInterrupt(int signal)
void send_job(zactor_t *, std::string, uint64_t);
void send_job(zactor_t * actor, std::string cmd, uint64_t jobID)
{
SPD_INFO(
SPD_TRACE(
"Sending job [{}] ID[0x{:016X}] to actor [{}]", cmd, jobID, static_cast<void *>(actor));
zmsg_t * msg = zmsg_new();
......@@ -35,12 +35,12 @@ void send_job(zactor_t * actor, std::string cmd, uint64_t jobID)
zsock_send(actor, "m", msg);
zmsg_destroy(&msg);
SPD_DEBUG("Job ID[0x{:016X}] sent!", jobID);
SPD_TRACE("Job ID[0x{:016X}] sent!", jobID);
}
int main()
{
SPD_INFO("Running Salsa Exec Server...");
SPD_TRACE("Running Salsa Exec Server...");
// Attach signals
SPD_TRACE("Attaching signals");
......@@ -57,7 +57,7 @@ int main()
}
unsigned int const nthreads = std::thread::hardware_concurrency();
SPD_INFO("Detected {} cores", nthreads);
SPD_TRACE("Detected {} cores", nthreads);
if (nthreads == 0)
{
SPD_ERROR("Failed to detect thread count!");
......@@ -77,7 +77,7 @@ int main()
zpoller_add(poller, router);
// Create actors
SPD_DEBUG("Creating actors");
SPD_TRACE("Creating actors");
for (unsigned int i = 0; i < nthreads; i++)
{
SPD_TRACE("-> zactor ID[{}]", i);
......@@ -115,7 +115,7 @@ int main()
if (zframe_streq(zmsg_first(msg), "$EXIT"))
{
char * exitStat = zframe_strdup(zmsg_next(msg));
SPD_DEBUG("Actor [{}][{}] exited [{}]",
SPD_TRACE("Actor [{}][{}] exited [{}]",
position,
static_cast<void *>(actor),
exitStat);
......@@ -145,26 +145,26 @@ int main()
zmsg_t * msg = zmsg_recv(zactors[actor.first]);
zmsg_first(msg);
char * cpid = zframe_strdup(zmsg_next(msg));
SPD_DEBUG("-> Got PID [{}]", cpid);
SPD_TRACE("-> Got PID [{}]", cpid);
free(cpid);
zmsg_destroy(&msg);
// Error checking perhaps?
nodeStatus.find(actor.first)->second = true;
availableJobs.pop();
SPD_DEBUG("-> --- DONE: Job sent ---");
SPD_TRACE("-> --- DONE: Job sent ---");
break;
} // END if actor free
}
} // END assign job
} // END while not interrupted
SPD_INFO("<<zsys_interrupted>> Shutting down...");
SPD_TRACE("<<zsys_interrupted>> Shutting down...");
SPD_INFO("Cleaning up");
SPD_TRACE("Cleaning up");
for (auto & zactor : zactors)
{
SPD_DEBUG("Destroying actor {}", static_cast<void *>(zactor));
SPD_TRACE("Destroying actor {}", static_cast<void *>(zactor));
zactor_destroy(&zactor);
}
......@@ -173,6 +173,6 @@ int main()
zpoller_destroy(&poller);
zsock_destroy(&router);
SPD_INFO("Exiting...");
SPD_TRACE("Exiting...");
return 0;
}
......@@ -12,7 +12,7 @@ int main(int argc, char ** argv)
std::ifstream ifs(argv[1]);
SPD_INFO("Running Exec client...");
SPD_TRACE("Running Exec client...");
zpoller_t * poller = zpoller_new(nullptr);
zsock_t * router = zsock_new_router("@tcp://127.0.10.20:5550");
......@@ -20,7 +20,7 @@ int main(int argc, char ** argv)
zsock_t * dealer = zsock_new_dealer(">tcp://localhost:5555");
if (dealer == nullptr)
{
SPD_INFO("Failed to create dealer!");
SPD_TRACE("Failed to create dealer!");
return 2;
}
......@@ -43,7 +43,7 @@ int main(int argc, char ** argv)
ji.clear_logtargets();
ji.add_logtargets(fmt::format("file:///tmp/salsa-{}.log", id));
SPD_INFO("[ID {:016X}][{}]", id++, command);
SPD_TRACE("[ID {:016X}][{}]", id++, command);
ji.SerializeToString(&payload);
zstr_send(dealer, payload.c_str());
......@@ -67,7 +67,7 @@ int main(int argc, char ** argv)
if (static_cast<std::string>(rxStr) == "~MASTER-EXIT")
{
free(rxStr);
SPD_INFO("Master exiting early!");
SPD_TRACE("Master exiting early!");
break;
}
......@@ -90,24 +90,24 @@ int main(int argc, char ** argv)
rxFail++;
}
SPD_INFO("-> Rx Job cmd [{}] exit [{}] id [{:016X}:{:016X}:{:016X}]",
ji.data(),
ji.returncode(),
ji.clientid(),
ji.jobid(),
ji.taskid());
SPD_TRACE("-> Rx Job cmd [{}] exit [{}] id [{:016X}:{:016X}:{:016X}]",
ji.data(),
ji.returncode(),
ji.clientid(),
ji.jobid(),
ji.taskid());
rx++;
ok = true;
}
if (ok)
{
SPD_INFO("[STATUS] {} total, {} running, {} done ({} ok, {} failed)",
id,
running,
rx,
rxOk,
rxFail);
SPD_TRACE("[STATUS] {} total, {} running, {} done ({} ok, {} failed)",
id,
running,
rx,
rxOk,
rxFail);
}
}
......@@ -115,9 +115,9 @@ int main(int argc, char ** argv)
}
}
SPD_INFO("----- Sent [{}] jobs, rxd back [{}] jobs -----", id, rx);
SPD_TRACE("----- Sent [{}] jobs, rxd back [{}] jobs -----", id, rx);
SPD_INFO("Destroying and exiting...");
SPD_TRACE("Destroying and exiting...");
zsock_destroy(&dealer);
zsock_destroy(&router);
......
......@@ -44,12 +44,12 @@ int main(int argc, char ** args)
nextOption = getopt_long(argc, args, short_options.data(), long_options, nullptr);
}
SPD_INFO("Starting {} v{}.{}.{}-{} ...",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
SPD_TRACE("Starting {} v{}.{}.{}-{} ...",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
// MAIN
handle_debug_from_env(debugLevel);
......@@ -57,7 +57,7 @@ int main(int argc, char ** args)
// Adding '@' to bind
url.insert(0, 1, '@');
SPD_INFO("Listening at '{}' with subscription '{}'", url.data(), subscribe.data());
SPD_TRACE("Listening at '{}' with subscription '{}'", url.data(), subscribe.data());
// Creating socket
zsock_t * sub = zsock_new_sub(url.data(), subscribe.data());
......@@ -85,12 +85,12 @@ void help()
{
spdlog::set_pattern("%v");
SPD_INFO("{}-mon v{}.{}.{}-{}",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
SPD_TRACE("{}-mon v{}.{}.{}-{}",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
// Release and close all loggers
spdlog::drop_all();
......@@ -119,7 +119,7 @@ void handle_debug_from_env(int debugLevel)
if (debugLevel >= 0)
{
SPD_INFO(
SPD_TRACE(
"Setting log level to '{}' ...",
spdlog::level::to_string_view(static_cast<spdlog::level::level_enum>(6 - debugLevel)));
spdlog::set_level(static_cast<spdlog::level::level_enum>(6 - debugLevel));
......
......@@ -39,6 +39,6 @@ int main(int argc, char ** argv)
{
zpoller_wait(poller, -1);
}
SPD_INFO("Exiting ...");
SPD_TRACE("Exiting ...");
return 0;
}
......@@ -123,7 +123,7 @@ int main(int argc, char ** argv)
if (!publisher.empty())
{
SPD_INFO("Creating user-def publisher [{}]", publisher);
SPD_TRACE("Creating user-def publisher [{}]", publisher);
std::shared_ptr<Salsa::Publisher> pPub = std::make_shared<Salsa::PublisherZmq>(publisher);
pRootNode->add(pPub);
}
......@@ -189,7 +189,7 @@ int main(int argc, char ** argv)
SPD_INFO("Exiting {} with success ...", SALSA_NAME);
// Release and close all loggers
// spdlog::drop_all();
spdlog::drop_all();
// Exit with success
return 0;
......@@ -199,12 +199,12 @@ void help()
{
spdlog::set_pattern("%v");
SPD_INFO("{} v{}.{}.{}-{}",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
SPD_TRACE("{} v{}.{}.{}-{}",
SALSA_NAME,
SALSA_VERSION_MAJOR(SALSA_VERSION),
SALSA_VERSION_MINOR(SALSA_VERSION),
SALSA_VERSION_PATCH(SALSA_VERSION),
SALSA_VERSION_RELEASE);
// Release and close all loggers
spdlog::drop_all();
......@@ -221,11 +221,11 @@ std::shared_ptr<Salsa::Node> create_root_node( //
{
std::shared_ptr<Salsa::Node> pMainNode = nullptr;
SPD_DEBUG("Caching hostname via zsys_hostname()");
SPD_TRACE("Caching hostname via zsys_hostname()");
char * pHostnameCStr_ = zsys_hostname();
std::string const hostname = pHostnameCStr_;
free(pHostnameCStr_);
SPD_DEBUG("Cached hostname [{}]", hostname);
SPD_TRACE("Cached hostname [{}]", hostname);
// Check if config path was provided
if (configPath.empty())
......@@ -297,7 +297,7 @@ std::shared_ptr<Salsa::Node> create_root_node( //
}
}
SPD_INFO("Requested network [{}] count [{}]", netName, netCount);
SPD_TRACE("Requested network [{}] count [{}]", netName, netCount);
// =====================================================================
......@@ -315,7 +315,7 @@ std::shared_ptr<Salsa::Node> create_root_node( //
// jointNode = std::make_shared<Salsa::Node>(
// "joint:{}:{}:{}:{}"_format(iJoint->first, hostname, getpid(), nodeId));
// nodeId++;
SPD_INFO("Building joint [{}]...", iJoint->first);
SPD_TRACE("Building joint [{}]...", iJoint->first);
if (netCount > 1)
{
......@@ -325,7 +325,7 @@ std::shared_ptr<Salsa::Node> create_root_node( //
else if (iNetwork != networks.end())
{
buildNodes.push_back(iNetwork->first);
SPD_INFO("Building network [{}]...", iNetwork->first);
SPD_TRACE("Building network [{}]...", iNetwork->first);
}
else
{
......@@ -338,7 +338,7 @@ std::shared_ptr<Salsa::Node> create_root_node( //
iNetwork = networks.find(reqNet);
if (iNetwork != networks.end()) // If network found
{
SPD_INFO("-> Creating network [{}] size [{}]", iNetwork->first, netCount);
SPD_TRACE("-> Creating network [{}] size [{}]", iNetwork->first, netCount);
std::string const & name = iNetwork->first;
auto & props = iNetwork->second;
......@@ -356,11 +356,11 @@ std::shared_ptr<Salsa::Node> create_root_node( //
std::string zyreName =
"{}:{}:{}:{}"_format(name, hostname, getpid(), nodeId);
SPD_INFO("-> > NodeZyre name [{}] zyre_name [{}] type [{}] port [{}]",
name,
zyreName,
props.mType,
props.mPort);
SPD_TRACE("-> > NodeZyre name [{}] zyre_name [{}] type [{}] port [{}]",
name,
zyreName,
props.mType,
props.mPort);
// Create zyre node
std::shared_ptr<Salsa::NodeZyre> pNodeZyre =
......@@ -380,7 +380,7 @@ std::shared_ptr<Salsa::Node> create_root_node( //
props.mTransport);
}
SPD_INFO("pSocketZyre->port(props.mPort [{}])", props.mPort);
SPD_TRACE("pSocketZyre->port(props.mPort [{}])", props.mPort);
pSocketZyre->port(props.mPort); // Set socket's port
pSocketZyre->connect(); // Connect to socket
pNodeZyre->addSocket(pSocketZyre); // Add socket to zyre node
......@@ -519,7 +519,7 @@ void parse_config(std::string configPath, NetworkMap_t & targetNetworks, JointMa
// Check packetizer
if (!net.isMember("packetizer"))
{
SPD_WARN("JSON Network @ [{}] missing [packetizer], using default [false]...", iPos);
SPD_TRACE("JSON Network @ [{}] missing [packetizer], using default [false]...", iPos);
}
else if (!net["packetizer"].isBool())
{
......
......@@ -89,14 +89,14 @@ void ActorZmq::SalsaActorForkFn(zsock_t * pPipe, void *)
{
// GET command from message
char * pCommand = zframe_strdup(pFrame);
SPD_DEBUG("PA: got Command [{}]", pCommand);
SPD_TRACE("PA: got Command [{}]", pCommand);
// GET targets from message
Salsa::Log log;
while ((pFrame = zmsg_next(pReceived)) != nullptr)
{
char * pMessage = zframe_strdup(pFrame);
SPD_DEBUG("PA: Adding log target [{}]", pMessage);
SPD_TRACE("PA: Adding log target [{}]", pMessage);
log.add(pMessage);
zstr_free(&pMessage);
}
......@@ -114,7 +114,7 @@ void ActorZmq::SalsaActorForkFn(zsock_t * pPipe, void *)
log.create();
log.spd()->info("Running [{}]", pCommand);
SPD_DEBUG("PA: Waiting for pipes...");
SPD_TRACE("PA: Waiting for pipes...");
int pipefd[2];
if (pipe2(pipefd, O_NONBLOCK))
{
......@@ -164,7 +164,7 @@ void ActorZmq::SalsaActorForkFn(zsock_t * pPipe, void *)
{
// FORK Parent handler
// Send PID to parent
SPD_DEBUG("PA Parent: Sending PID [{}] to parent", pid);
SPD_TRACE("PA Parent: Sending PID [{}] to parent", pid);
{
zmsg_t * pTx = zmsg_new();
zmsg_addstr(pTx, "$PID");
......@@ -179,7 +179,7 @@ void ActorZmq::SalsaActorForkFn(zsock_t * pPipe, void *)
log.fd(pipefd[0]);
zactor_t * pWatcherActor = zactor_new(actor_procwait_support_, &log);
SPD_DEBUG("PA Parent: Running command...");
SPD_TRACE("PA Parent: Running command...");
// Read from pipe until child dies
while (true)
{
......@@ -374,7 +374,7 @@ void * ActorZmq::wait()
zmsg_destroy(&pMsg);
if (streq(pCommand, "$TERM"))
{
SPD_DEBUG("ActorZmq::exec(): received $TERM");
SPD_TRACE("ActorZmq::exec(): received $TERM");
mTerminated = true;
}
else
......
......@@ -91,7 +91,7 @@ int NodeZyre::init()
}
}
SPD_DEBUG("Will create [{}] workers...", numCores);
SPD_TRACE("Will create [{}] workers...", numCores);
for (unsigned int i = 0; i < numCores; i++)
{
......@@ -147,7 +147,7 @@ int NodeZyre::exec()
}
}
SPD_INFO("Actor::wait()");
SPD_TRACE("Actor::wait()");
p = ActorZmq::wait();
if (p)
{
......@@ -234,7 +234,7 @@ int NodeZyre::exec()
static_cast<void *>(pSocket.get()),
static_cast<void *>(msg));
Message::EventType type = msg->event();
SPD_DEBUG("Salsa::NodeZyre::exec() : From net={} type={}",
SPD_TRACE("Salsa::NodeZyre::exec() : From net={} type={}",
static_cast<void *>(pSocket.get()),
type);
if (type == Message::ENTER)
......@@ -246,7 +246,7 @@ int NodeZyre::exec()
// Add node to packetizer
if (mpPacketizer)
mpPacketizer->addNode(msg->uuid());
SPD_INFO("[{}] ENTER uuid={}", zyre_name(pSocket->zyre()), msg->uuid());
SPD_TRACE("[{}] ENTER uuid={}", zyre_name(pSocket->zyre()), msg->uuid());
// publish();
}
else if (type == Message::EXIT)
......@@ -256,7 +256,7 @@ int NodeZyre::exec()
if (mpPacketizer)
mpPacketizer->removeNode(msg->uuid());
SPD_INFO("[{}] EXIT uuid={}", zyre_name(pSocket->zyre()), msg->uuid());
SPD_TRACE("[{}] EXIT uuid={}", zyre_name(pSocket->zyre()), msg->uuid());
// publish();
}
else if (type == Message::WHISPER)
......@@ -285,7 +285,7 @@ int NodeZyre::exec()
{
if (mpPacketizer && mpPacketizer->nextJobAvailable())
{
SPD_INFO("[[ M ]] Pushing to worker");
SPD_TRACE("[[ M ]] Pushing to worker");
std::string jobString;
mpPacketizer->getNextJob().SerializeToString(&jobString);
pSocket->push(msg->uuid(), jobString);
......@@ -321,7 +321,7 @@ int NodeZyre::exec()
// either job is done
if (mpPacketizer)
{
SPD_INFO("[[ M ]] Finished job w/data [{}]", jobInfo.data());
SPD_TRACE("[[ M ]] Finished job w/data [{}]", jobInfo.data());
mpPacketizer->finishJob(jobInfo);
{
......
......@@ -32,7 +32,7 @@ void PublisherZmq::publish(std::string name, std::string data)
return;
}
SPD_DEBUG("PublisherZmq::publish() Sending msg name={} data={}", name, data);
SPD_TRACE("PublisherZmq::publish() Sending msg name={} data={}", name, data);
zmsg_t * msg = zmsg_new();
zmsg_addstr(msg, name.data());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment