Revision 118:1b6c7d06d933, committed 2015-05-20

Comitter:

xinlei

Date:

Wed May 20 10:19:28 2015 +0000

Parent:

117:e831cdb799ab

Child:

119:f85151fa1a8a

Commit message:

shorten error messages in device integration

Changed in this revision

--- a/DeviceIntegration.cpp	Wed May 20 09:57:55 2015 +0000
+++ b/DeviceIntegration.cpp	Wed May 20 10:19:28 2015 +0000
@@ -52,7 +52,7 @@
 
     // template bootstrapping process
     if (_client.bootstrap(_tpl) != SMARTREST_SUCCESS) {
-        aError("Template bootstrap failed.\r\n");
+        aError("Template bootstrap.\n");
         return false;
     }
 
@@ -97,7 +97,7 @@
     }
     
     if (received.value(0).integerValue() != 200) {
-        aError("Unknown message ID: %d.\n", received.value(0).integerValue());
+        aError("Unknown msg %d.\n", received.value(0).integerValue());
         return false;
     }
     setDeviceID(received.value(2).integerValue());
@@ -110,8 +110,6 @@
     ComposedRecord record;
     ParsedRecord received;
 
-    aInfo("Create device...\n");
-
     IntegerValue msgId(101);
     CharValue imei(_deviceInfo.imei());
     if ((!record.add(msgId)) || (!record.add(imei)))
@@ -123,19 +121,19 @@
     }
 
     if (_client.receive(received) != SMARTREST_SUCCESS) {
-        aError("No device found.\n");
+        aError("Create device.\n");
         _client.stop();
         return false;
     }
     _client.stop();
 
     if (received.values() != 3) {
-        aError("createDevice: Incomplete response.\n");
+        aError("%d/3 values received.\n", received.values());
         return false;
     }
     
     if (received.value(0).integerValue() != 201) {
-        aError("createDevice: Unknown message ID: %d.\n", received.value(0).integerValue());
+        aError("Unknown msg %d.\n", received.value(0).integerValue());
         return false;
     }
 
@@ -148,8 +146,6 @@
     ComposedRecord record;
     ParsedRecord received;
 
-    aInfo("Add global identifier.\n");
-
     IntegerValue msgId(102);
     IntegerValue devId(deviceID);
     CharValue imei(_deviceInfo.imei());
@@ -157,25 +153,25 @@
         return false;
 
     if (_client.send(record) != SMARTREST_SUCCESS) {
-        aWarning("Adding global identifier failed.\r\n");
+        aWarning("Add X-ID failed.\n");
         _client.stop();
         return false;
     }
 
     if (_client.receive(received) != SMARTREST_SUCCESS) {
-        aError("Receive identifier failed.\n");
+        aError("Receive X-ID failed.\n");
         _client.stop();
         return false;
     }
     _client.stop();
 
     if (received.values() != 3) {
-        aError("%d (3) values received.\n", received.values());
+        aError("%d/3 values received.\n", received.values());
         return false;
     }
     
     if (received.value(0).integerValue() != 200) {
-        aError("Unknown message ID: %d\n", received.value(0).integerValue());
+        aError("Unknown msg %d\n", received.value(0).integerValue());
         return false;
     }
 
@@ -192,7 +188,6 @@
     CharValue imei(_deviceInfo.imei());
     CharValue cellId(_deviceInfo.cellId());
     CharValue iccid(_deviceInfo.iccid());
-    aInfo("Update Device.\n");
     if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(imei)) || (!record.add(cellId)) || (!record.add(iccid)))
         return false;
 
@@ -210,12 +205,12 @@
     _client.stop();
 
     if (received.values() != 3) {
-        aError("%d (3) values received.\n", received.values());
+        aError("%d/3 values received.\n", received.values());
         return false;
     }
-    
+
     if (received.value(0).integerValue() != 201) {
-        aError("Unknown message ID: %d\n", received.value(0).integerValue());
+        aError("Unknown msg %d\n", received.value(0).integerValue());
         return false;
     }