Merge pull request #131 from telefonicaid/bug/timeoutsInCommands

ADD Timeout for command calls
telefonicaid · Jul 7, 2016 · 7343742 · 7343742
2 parents 04a9e9a + 0f7fe11
commit 7343742
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1 +1 @@
-- FIX Commands won't write the Error results in the Context Broker.
+- No timeout defined for HTTP commands (#97)
diff --git a/config.js b/config.js
@@ -55,6 +55,11 @@ config.http = {
      * Port where the HTTP Ultralight transport binding will be listening for device requests.
      */
     port: 7896
+
+    /**
+     * HTTP Timeout for the http command endpoint (in miliseconds).
+     */
+    //timeout: 1000
 };
 
 config.iota = {

diff --git a/lib/bindings/HTTPBindings.js b/lib/bindings/HTTPBindings.js
@@ -223,6 +223,11 @@ function generateCommandExecution(apiKey, device, attribute) {
         }
     };
 
+
+    if (config.getConfig().http.timeout) {
+        options.timeout = config.getConfig().http.timeout;
+    }
+
     return function sendUlCommandHTTP(callback) {
         request(options, function(error, response, body) {
             if (error) {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "iotagent-ul",
   "description": "IoT Agent for the Ultrlight 2.0 protocol",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "homepage": "https://github.com/dmoranj/iotagent-ul",
   "author": {
     "name": "Daniel Moran",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		- FIX Commands won't write the Error results in the Context Broker.
		- No timeout defined for HTTP commands (#97)