Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-12 16:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Tuto3 double delete, cleanup test output, undeclared var in NN socket.

Browse Source
This commit is contained in:
Alexey Rybalchenko 2017-02-23 15:59:28 +01:00 committed by Mohammad Al-Turany
parent b43d4c142d
commit 7c1f7aa3f2
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/FairMQLogger.h
View File

@ -32,9 +32,9 @@
DEBUG, DEBUG,
RESULTS, RESULTS,
INFO, INFO,
STATE,
WARN, WARN,
ERROR, ERROR,
STATE,
NOLOG NOLOG
}; };

4
fairmq/logger/logger_def.h
View File

@ -31,9 +31,9 @@ enum severity_level
DEBUG, DEBUG,
RESULTS, RESULTS,
INFO, INFO,
STATE,
WARN, WARN,
ERROR, ERROR,
STATE,
NOLOG NOLOG
}; };
@ -44,9 +44,9 @@ static const std::array<std::string, 8> g_LogSeverityLevelString
"DEBUG", "DEBUG",
"RESULTS", "RESULTS",
"INFO", "INFO",
"STATE",
"WARN", "WARN",
"ERROR", "ERROR",
"STATE",
"NOLOG" "NOLOG"
} }
}; };

2
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -212,8 +212,8 @@ int FairMQSocketNN::Receive(FairMQMessagePtr& msg, const int flags)
int64_t FairMQSocketNN::Send(vector<unique_ptr<FairMQMessage>>& msgVec, const int flags) int64_t FairMQSocketNN::Send(vector<unique_ptr<FairMQMessage>>& msgVec, const int flags)
{ {
#ifdef MSGPACK_FOUND
const unsigned int vecSize = msgVec.size(); const unsigned int vecSize = msgVec.size();
#ifdef MSGPACK_FOUND
// create msgpack simple buffer // create msgpack simple buffer
msgpack::sbuffer sbuf; msgpack::sbuffer sbuf;

4
fairmq/test/pub-sub/runTestPub.cxx
View File

@ -17,6 +17,8 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
FairMQTestPub testPub; FairMQTestPub testPub;
testPub.CatchSignals(); testPub.CatchSignals();
@ -38,8 +40,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
testPub.SetProperty(FairMQTestPub::Id, "testPub"); testPub.SetProperty(FairMQTestPub::Id, "testPub");
FairMQChannel controlChannel("pull", "bind", "tcp://127.0.0.1:5555"); FairMQChannel controlChannel("pull", "bind", "tcp://127.0.0.1:5555");

6
fairmq/test/pub-sub/runTestSub.cxx
View File

@ -19,6 +19,9 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(WARN);
FairMQTestSub testSub; FairMQTestSub testSub;
testSub.CatchSignals(); testSub.CatchSignals();
@ -40,9 +43,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(NOLOG);
testSub.SetProperty(FairMQTestSub::Id, "testSub_" + std::to_string(getpid())); testSub.SetProperty(FairMQTestSub::Id, "testSub_" + std::to_string(getpid()));
FairMQChannel controlChannel("push", "connect", "tcp://127.0.0.1:5555"); FairMQChannel controlChannel("push", "connect", "tcp://127.0.0.1:5555");

4
fairmq/test/push-pull/runTestPull.cxx
View File

@ -17,6 +17,8 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
FairMQTestPull testPull; FairMQTestPull testPull;
testPull.CatchSignals(); testPull.CatchSignals();
@ -38,8 +40,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
testPull.SetProperty(FairMQTestPull::Id, "testPull"); testPull.SetProperty(FairMQTestPull::Id, "testPull");
FairMQChannel pullChannel("pull", "connect", "tcp://127.0.0.1:5557"); FairMQChannel pullChannel("pull", "connect", "tcp://127.0.0.1:5557");

6
fairmq/test/push-pull/runTestPush.cxx
View File

@ -17,6 +17,9 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(WARN);
FairMQTestPush testPush; FairMQTestPush testPush;
testPush.CatchSignals(); testPush.CatchSignals();
@ -38,9 +41,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(NOLOG);
testPush.SetProperty(FairMQTestPush::Id, "testPush"); testPush.SetProperty(FairMQTestPush::Id, "testPush");
FairMQChannel pushChannel("push", "bind", "tcp://127.0.0.1:5557"); FairMQChannel pushChannel("push", "bind", "tcp://127.0.0.1:5557");

4
fairmq/test/req-rep/runTestRep.cxx
View File

@ -19,6 +19,8 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
FairMQTestRep testRep; FairMQTestRep testRep;
testRep.CatchSignals(); testRep.CatchSignals();
@ -40,8 +42,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
testRep.SetProperty(FairMQTestRep::Id, "testRep"); testRep.SetProperty(FairMQTestRep::Id, "testRep");
FairMQChannel repChannel("rep", "bind", "tcp://127.0.0.1:5558"); FairMQChannel repChannel("rep", "bind", "tcp://127.0.0.1:5558");

6
fairmq/test/req-rep/runTestReq.cxx
View File

@ -19,6 +19,9 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(WARN);
FairMQTestReq testReq; FairMQTestReq testReq;
testReq.CatchSignals(); testReq.CatchSignals();
@ -40,9 +43,6 @@ int main(int argc, char** argv)
return 1; return 1;
} }
reinit_logger(false);
SET_LOG_CONSOLE_LEVEL(NOLOG);
testReq.SetProperty(FairMQTestReq::Id, "testReq" + std::to_string(getpid())); testReq.SetProperty(FairMQTestReq::Id, "testReq" + std::to_string(getpid()));
FairMQChannel reqChannel("req", "connect", "tcp://127.0.0.1:5558"); FairMQChannel reqChannel("req", "connect", "tcp://127.0.0.1:5558");