Revision: 40691
http://brlcad.svn.sourceforge.net/brlcad/?rev=40691&view=rev
Author: davidloman
Date: 2010-09-27 08:46:41 +0000 (Mon, 27 Sep 2010)
Log Message:
-----------
Convert some bu_log statements into Logger:: calls (since Logger uses bu_log
anyways)
Modified Paths:
--------------
rt^3/trunk/include/Portal.h
rt^3/trunk/src/libNet/Portal.cxx
rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx
Modified: rt^3/trunk/include/Portal.h
===================================================================
--- rt^3/trunk/include/Portal.h 2010-09-26 22:17:59 UTC (rev 40690)
+++ rt^3/trunk/include/Portal.h 2010-09-27 08:46:41 UTC (rev 40691)
@@ -58,6 +58,7 @@
private:
PkgTcpClient* pkgClient;
QString remoteNodeName;
+ Logger* log;
static void callbackSpringboard(struct pkg_conn* conn, char* buf);
};
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-09-26 22:17:59 UTC (rev 40690)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-09-27 08:46:41 UTC (rev 40691)
@@ -24,6 +24,7 @@
*/
#include "Portal.h"
+#include "Logger.h"
#include "brlcad/bu.h"
#include "NetMsgFactory.h"
@@ -38,6 +39,7 @@
};
this->pkgClient->setCallBackTable(table);
+ this->log = Logger::getInstance();
}
Portal::~Portal()
@@ -61,24 +63,24 @@
//recv first
retval = this->pkgClient->processData();
if (retval < 0){
- bu_log("Unable to process packets? Weird.\n");
+ this->log->logERROR("Portal", "Unable to process packets? Weird.\n");
return retval;
}//TODO do we need to check for ==0 ?
retval = this->pkgClient->pullDataFromSocket();
if (retval < 0) {
- bu_log("Seemed to have trouble pulling the data from the socket.\n");
+ this->log->logERROR("Portal", "Seemed to have trouble pulling the
data from the socket.\n");
return retval;
} else if (retval == 0) {
- bu_log("Client closed the connection.\n");
+ this->log->logERROR("Portal", "Client closed the connection.\n");
return retval;
}
retval = this->pkgClient->processData();
if (retval < 0){
- bu_log("Unable to process packets? Weird.\n");
+ this->log->logERROR("Portal", "Unable to process packets? Weird.\n");
return retval;
}//TODO do we need to check for ==0 ?
Modified: rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx
===================================================================
--- rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx 2010-09-26 22:17:59 UTC (rev
40690)
+++ rt^3/trunk/tests/libpkgcpp/pkgcppTest.cxx 2010-09-27 08:46:41 UTC (rev
40691)
@@ -26,6 +26,7 @@
#include "brlcad/bu.h"
#include "brlcad/pkg.h"
#include "libpkgcpp.h"
+#include "libutility.h"
#include <stdio.h>
#include <iostream>
#include <algorithm>
@@ -197,7 +198,7 @@
validate magic header that client should have sent
if (strcmp(buffer, CLIENT_NAME) != 0)
{
- bu_log("Data Error, received a PKGCPP_HELO without proper data!\n");
+ Logger::getInstance()->logERROR(("Received a PKGCPP_HELO without proper
data!\n");
pkgClient->close();
}
@@ -215,7 +216,7 @@
/* we got a validated client, process packets from the
* connection. boilerplate triple-call loop.
*/
- bu_log("Processing data from client\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Processing data from
client\n");
do
{
bu_log("Loop Pass #%d\n", counter);
@@ -227,12 +228,12 @@
int pkg_result = pkgClient->pullDataFromSocket();
if (pkg_result < 0)
{
- bu_log("Seemed to have trouble sucking in packets.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Seemed to have trouble
sucking in packets.\n");
break;
}
else if (pkg_result == 0)
{
- bu_log("Client closed the connection.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Client closed the
connection.\n");
//usleep(100);
//break;
}
@@ -246,7 +247,7 @@
}
while (pkgClient != NULL && itemsRemain != 0 && listenLoop);
- bu_log("Done with client. Closing connection.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Done with client. Closing
connection.\n");
pkgClient->close();
@@ -276,7 +277,7 @@
bu_bomb("ERROR: Unable to open a connection to the server\n");
}
- bu_log("Sending HELO to server.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Sending HELO to server.\n");
long bytes = 0;
@@ -310,7 +311,7 @@
sleep(1);
}
- bu_log("Sending CIAO.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Sending CIAO.\n");
/* let the server know we're done. not necessary, but polite. */
bytes = connToServer->send(PKGCPP_CIAO, "CIAO", 4);
if (bytes < 0)
@@ -320,7 +321,7 @@
}
sleep(5);
- bu_log("Disconnecting.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Disconnecting.\n");
connToServer->close();
delete connToServer;
return 0;
@@ -332,7 +333,7 @@
int pkg_result = pkgClient->processData();
if (pkg_result < 0)
{
- bu_log("Unable to process packets? Weird.\n");
+ Logger::getInstance()->logINFO("PkgCppTest", "Unable to process
packets? Weird.\n");
}
return pkg_result;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
