Diff: MbedClient.cpp

Revision:

25:b8a080f5e578

Parent:

24:11fd6fd14c28

Child:

26:9c36af176d91

--- a/MbedClient.cpp	Thu May 07 09:57:32 2015 +0000
+++ b/MbedClient.cpp	Mon Jun 01 12:56:26 2015 +0000
@@ -68,7 +68,7 @@
     if (_state != STATE_INIT)
         return internalError();
 
-    MBCL_DBG("\033[32mMbedClient:\033[39m Begin SmartREST request.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m Begin SmartREST request.\n");
     _source.setTimeout(60000);
     if (!connect())
         return connectionError();
@@ -88,7 +88,7 @@
     // set stream request flag to later set the timeout right
     _isStreamRequest = true;
 
-    MBCL_DBG("\033[32mMbedClient:\033[39m Begin SmartREST stream.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m Begin SmartREST stream.\n");
     _source.setTimeout(60000);
     if (!connect())
         return connectionError();
@@ -102,7 +102,7 @@
 
 uint8_t MbedClient::sendIdentifier(const char* identifier)
 {
-    MBCL_DBG("\033[32mMbedClient:\033[39m Send identifier.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m Send x-id.\n");
     if (_state != STATE_IN_REQUEST)
         return internalError();
 
@@ -118,7 +118,7 @@
 
 uint8_t MbedClient::sendData(const DataGenerator& generator)
 {
-    MBCL_DBG("\033[32mMbedClient:\033[39m Send payload.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m Send payload.\n");
     if (_state != STATE_IN_REQUEST && _state != STATE_SENT_ID)
         return internalError();
     
@@ -136,7 +136,7 @@
 
 uint8_t MbedClient::endRequest()
 {
-    MBCL_DBG("\033[32mMbedClient:\033[39m End request.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m End request.\n");
     if ((_state != STATE_IN_REQUEST) &&
         (_state != STATE_SENT_ID) &&
         (_state != STATE_SENT_DATA)) {
@@ -160,7 +160,6 @@
 
 uint8_t MbedClient::awaitResponse()
 {
-    aDebug("\033[32mThread %p:\033[39m Await response.\n", Thread::gettid());
     if (_state != STATE_REQ_COMPLETE) {
         return internalError();
     }
@@ -185,7 +184,7 @@
 
 void MbedClient::stop()
 {
-    MBCL_DBG("\033[32mMbedClient:\033[39m Reset client, %zu bytes sent.\n", packetSize);
+    aInfo("\033[32mMbed:\033[39m %zu bytes sent.\n", packetSize);
     _isStreamRequest = false;
     _sock.close();
     _source.reset();
@@ -205,9 +204,9 @@
                 continue;
             const unsigned char *c = (const unsigned char*)&ip;
             snprintf(cachedIP, sizeof(cachedIP), "%u.%u.%u.%u", c[3], c[2], c[1], c[0]);
-            aInfo("\033[32mThread %p:\033[39m Connect to %s:%d (IP: %s)\n", Thread::gettid(), srHost, ::srPort, cachedIP);
+            aInfo("Connect to %s:%d (IP: %s)\n", srHost, ::srPort, cachedIP);
         } else {
-            aDebug("\033[32mMThread %p:\033[39m Connect to %s:%d\n", Thread::gettid(), cachedIP, ::srPort);
+            aDebug("Connect to %s:%d\n", cachedIP, ::srPort);
         }
         if (_sock.connect(cachedIP, ::srPort) >= 0)
             break;
@@ -227,7 +226,7 @@
 
 bool MbedClient::sendRequestHeader(const char *uri)
 {
-    MBCL_DBG("\033[32mMbedClient:\033[39m Send header.\n");
+    MBCL_DBG("\033[32mMbed:\033[39m Send header.\n");
     if ((!send("POST ")) ||
         (!send(uri)) ||
         (!send(" HTTP/1.0\r\n")) ||
@@ -261,14 +260,14 @@
 
 uint8_t MbedClient::internalError()
 {
-    aError("\033[32mMbedClient:\033[39m Internal error.\n");
+    aError("\033[32mMbed:\033[39m Internal error.\n");
     _state = STATE_INTERNAL_ERROR;
     return CLIENT_INTERNAL_ERROR;
 }
 
 uint8_t MbedClient::connectionError()
 {
-    aError("\033[32mMbedClient:\033[39m Connect error.\n");
+    aError("\033[32mMbed:\033[39m Connect error.\n");
     _state = STATE_INTERNAL_ERROR;
     return CLIENT_CONNECTION_ERROR;
 }