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

convert log severities use to lowercase and remove use of MQLOG

Browse Source
This commit is contained in:
Alexey Rybalchenko
2017-12-22 10:40:50 +01:00
committed by Mohammad Al-Turany
parent 4e942e489b
commit a3393e600e
58 changed files with 607 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fairmq/test/helper/devices/TestPollIn.cxx
View File

@@ -61,7 +61,7 @@ class PollIn : public FairMQDevice
}
else
{
LOG(ERROR) << "wrong poll type provided: " << fPollType;
LOG(error) << "wrong poll type provided: " << fPollType;
}
bool arrived1 = false;
@@ -79,7 +79,7 @@ class PollIn : public FairMQDevice
{
if (poller->CheckInput(0))
{
LOG(DEBUG) << "CheckInput(0) triggered";
LOG(debug) << "CheckInput(0) triggered";
if (Receive(msg1, "data1", 0) >= 0)
{
arrived1 = true;
@@ -88,7 +88,7 @@ class PollIn : public FairMQDevice
if (poller->CheckInput(1))
{
LOG(DEBUG) << "CheckInput(1) triggered";
LOG(debug) << "CheckInput(1) triggered";
if (Receive(msg2, "data2", 0) >= 0)
{
arrived2 = true;
@@ -99,7 +99,7 @@ class PollIn : public FairMQDevice
{
if (poller->CheckInput("data1", 0))
{
LOG(DEBUG) << "CheckInput(\"data1\", 0) triggered";
LOG(debug) << "CheckInput(\"data1\", 0) triggered";
if (Receive(msg1, "data1", 0) >= 0)
{
arrived1 = true;
@@ -108,7 +108,7 @@ class PollIn : public FairMQDevice
if (poller->CheckInput("data2", 0))
{
LOG(DEBUG) << "CheckInput(\"data2\", 0) triggered";
LOG(debug) << "CheckInput(\"data2\", 0) triggered";
if (Receive(msg2, "data2", 0) >= 0)
{
arrived2 = true;
@@ -119,7 +119,7 @@ class PollIn : public FairMQDevice
if (arrived1 && arrived2)
{
bothArrived = true;
LOG(INFO) << "POLL test successfull";
LOG(info) << "POLL test successfull";
}
}
};

12
fairmq/test/helper/devices/TestPub.cxx
View File

@@ -39,17 +39,17 @@ class Pub : public FairMQDevice
auto r2 = Receive(ready2, "control");
if (r1 >= 0 && r2 >= 0)
{
LOG(INFO) << "Received both ready signals, proceeding to publish data";
LOG(info) << "Received both ready signals, proceeding to publish data";
auto msg = FairMQMessagePtr{NewMessage()};
auto d1 = Send(msg, "data");
if (d1 >= 0)
{
LOG(INFO) << "Sent data: d1 = " << d1;
LOG(info) << "Sent data: d1 = " << d1;
}
else
{
LOG(ERROR) << "Failed sending data: d1 = " << d1;
LOG(error) << "Failed sending data: d1 = " << d1;
}
auto ack1 = FairMQMessagePtr{NewMessage()};
@@ -58,16 +58,16 @@ class Pub : public FairMQDevice
auto a2 = Receive(ack2, "control");
if (a1 >= 0 && a2 >= 0)
{
LOG(INFO) << "PUB-SUB test successfull";
LOG(info) << "PUB-SUB test successfull";
}
else
{
LOG(ERROR) << "Failed receiving ack signal: a1 = " << a1 << ", a2 = " << a2;
LOG(error) << "Failed receiving ack signal: a1 = " << a1 << ", a2 = " << a2;
}
}
else
{
LOG(ERROR) << "Failed receiving ready signal: r1 = " << r1 << ", r2 = " << r2;
LOG(error) << "Failed receiving ready signal: r1 = " << r1 << ", r2 = " << r2;
}
}
};

2
fairmq/test/helper/devices/TestPull.cxx
View File

@@ -37,7 +37,7 @@ class Pull : public FairMQDevice
if (Receive(msg, "data") >= 0)
{
LOG(INFO) << "PUSH-PULL test successfull";
LOG(info) << "PUSH-PULL test successfull";
}
};
};

6
fairmq/test/helper/devices/TestRep.cxx
View File

@@ -34,19 +34,19 @@ class Rep : public FairMQDevice
auto request1 = FairMQMessagePtr{NewMessage()};
if (Receive(request1, "data") >= 0)
{
LOG(INFO) << "Received request 1";
LOG(info) << "Received request 1";
auto reply = FairMQMessagePtr{NewMessage()};
Send(reply, "data");
}
auto request2 = FairMQMessagePtr{NewMessage()};
if (Receive(request2, "data") >= 0)
{
LOG(INFO) << "Received request 2";
LOG(info) << "Received request 2";
auto reply = FairMQMessagePtr{NewMessage()};
Send(reply, "data");
}
LOG(INFO) << "REQ-REP test successfull";
LOG(info) << "REQ-REP test successfull";
};
};

2
fairmq/test/helper/devices/TestReq.cxx
View File

@@ -37,7 +37,7 @@ class Req : public FairMQDevice
auto reply = FairMQMessagePtr{NewMessage()};
if (Receive(reply, "data") >= 0)
{
LOG(INFO) << "received reply";
LOG(info) << "received reply";
}
};
};

12
fairmq/test/helper/devices/TestSub.cxx
View File

@@ -37,31 +37,31 @@ class Sub : public FairMQDevice
auto r1 = Send(ready, "control");
if (r1 >= 0)
{
LOG(INFO) << "Sent first control signal";
LOG(info) << "Sent first control signal";
auto msg = FairMQMessagePtr{NewMessage()};
auto d1 = Receive(msg, "data");
if (d1 >= 0)
{
LOG(INFO) << "Received data";
LOG(info) << "Received data";
auto ack = FairMQMessagePtr{NewMessage()};
auto a1 = Send(ack, "control");
if (a1 >= 0)
{
LOG(INFO) << "Sent second control signal";
LOG(info) << "Sent second control signal";
}
else
{
LOG(ERROR) << "Failed sending ack signal: a1 = " << a1;
LOG(error) << "Failed sending ack signal: a1 = " << a1;
}
}
else
{
LOG(ERROR) << "Failed receiving data: d1 = " << d1;
LOG(error) << "Failed receiving data: d1 = " << d1;
}
}
else
{
LOG(ERROR) << "Failed sending ready signal: r1 = " << r1;
LOG(error) << "Failed sending ready signal: r1 = " << r1;
}
}
};

10
fairmq/test/helper/devices/TestTransferTimeout.cxx
View File

@@ -29,27 +29,27 @@ class TransferTimeout : public FairMQDevice
if (Send(msg1, "data-out", 0, 100) == -2)
{
LOG(INFO) << "send canceled";
LOG(info) << "send canceled";
sendCanceling = true;
}
else
{
LOG(ERROR) << "send did not cancel";
LOG(error) << "send did not cancel";
}
if (Receive(msg2, "data-in", 0, 100) == -2)
{
LOG(INFO) << "receive canceled";
LOG(info) << "receive canceled";
receiveCanceling = true;
}
else
{
LOG(ERROR) << "receive did not cancel";
LOG(error) << "receive did not cancel";
}
if (sendCanceling && receiveCanceling)
{
LOG(INFO) << "Transfer timeout test successfull";
LOG(info) << "Transfer timeout test successfull";
}
};
};