Merge pull request #3 from ashpool/v0.0.3-beta2

v0.0.3
ashpool · Apr 8, 2015 · 5df8191 · 5df8191
2 parents f668764 + f1a6cb8
commit 5df8191
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/lib/carbon.js b/lib/carbon.js
@@ -20,9 +20,15 @@ CarbonClient.prototype.write = function (metrics, timestamp) {
                 }
             }
             socket.write(lines, 'utf-8', function (err) {
-                return err && reject(err) || resolve(lines);
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve(lines);
+                }
             });
-        }).catch(reject);
+        }, function (error) {
+            reject(error);
+        });
     });
 };
 
@@ -35,21 +41,32 @@ CarbonClient.prototype._connect = function () {
         var dsn = url.parse(self._url),
             port = parseInt(dsn.port, 10) || 2003,
             host = dsn.hostname,
+            timeout = 1000,
             socket = new net.Socket();
+        socket.setTimeout(timeout, function () {
+            socket.destroy();
+            reject(new Error('Socket timeout'));
+        });
+        socket.on('error', function (err) {
+            socket.destroy();
+            reject(err);
+        });
         self._socket = socket.connect(port, host, 1000, function (err) {
-            return err && reject(err) || resolve(self._socket);
+            if (err) {
+                reject(err);
+            } else {
+                resolve(self._socket);
+            }
         });
     });
 };
 
 CarbonClient.prototype.end = function () {
-    return new RSVP.Promise(function (resolve, reject) {
-        try {
-            resolve(this._socket && this._socket.end());
-        }
-        catch (err) {
-            reject(err);
+    return new RSVP.Promise(function (resolve) {
+        if (this._socket) {
+            this._socket.end();
         }
+        resolve();
     });
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphite-promise",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "A node.js module to interface with Graphite promise style",
   "main": "./lib/graphite",
   "directories": {