Changeset 46d70a

Timestamp:

01/12/12 14:43:58 (17 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '668dd99ac278cfd419d67879b141678facea630a')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

915d47dc1c4970c1a8c3abe077af197298a4777f

Parents:

5190c42f773010577f33be19f06db2b62d6ea9c4

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-12 11:49:12+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-12 14:43:58+01:00

Message:

Return TELLSTICK_ERROR_COMMUNICATION_SERVICE if we timeout when communicating with the service instead of returning success. This closes #152

Location:

telldus-core/client

Files:

• Client.cpp (modified) (1 diff)
• telldus-core.cpp (modified) (3 diffs)
• telldus-core.h (modified) (1 diff)

telldus-core/client/Client.cpp

@@ -115 +115 @@
 int Client::getIntegerFromService(const Message &msg) {
         std::wstring response = sendToService(msg);
+        if (response.compare(L"") == 0) {
+                return TELLSTICK_ERROR_COMMUNICATING_SERVICE;
+        }
         return Message::takeInt(&response);
 }

telldus-core/client/telldus-core.cpp

@@ -89 +89 @@
  * Error code. Input/command could not be parsed or didn't follow
  * input rules.
+ *
+ * @def TELLSTICK_ERROR_COMMUNICATING_SERVICE
+ * Error code. Timeout waiting for response from the Telldus Service.
  *
  * @def TELLSTICK_ERROR_UNKNOWN
@@ -492 +495 @@
  * @sa TELLSTICK_ERROR_SYNTAX
  * @sa TELLSTICK_ERROR_BROKEN_PIPE
+ * @sa TELLSTICK_ERROR_COMMUNICATING_SERVICE
  * @sa TELLSTICK_ERROR_UNKNOWN
  */
@@ -507 +511 @@
                 "Syntax error",
                 "Broken pipe"
+                "An error occured while communicating with the Telldus Service"
         };
         std::string strReturn;

telldus-core/client/telldus-core.h

@@ -118 +118 @@
 #define TELLSTICK_ERROR_SYNTAX -8
 #define TELLSTICK_ERROR_BROKEN_PIPE -9
+#define TELLSTICK_ERROR_COMMUNICATING_SERVICE -10
 #define TELLSTICK_ERROR_UNKNOWN -99