null is also defined

if (typeof null != "undefined") console.log('could be that this is the test node-etcd is using');
celevra · May 6, 2016 · 2e8e3ec · 2e8e3ec
1 parent 98a9cec
commit 2e8e3ec
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/etcd.js b/lib/etcd.js
@@ -7,7 +7,6 @@ var MAX_TRIES = 3;
 var BACKOFF = 2;
 
 var endpoints = [];
-var sslopts = null;
 if(!process.env.ETCD_ENDPOINTS) {
   endpoints.push('127.0.0.1:4001');
 } else {
@@ -19,7 +18,7 @@ if(!process.env.ETCD_ENDPOINTS) {
   });
 
   if(ssl) {
-    sslopts = {
+    var sslopts = {
       ca: fs.readFileSync(process.env.ETCD_CAFILE),
       cert: fs.readFileSync(process.env.ETCD_CERTFILE),
       key: fs.readFileSync(process.env.ETCD_KEYFILE),
@@ -30,7 +29,10 @@ if(!process.env.ETCD_ENDPOINTS) {
 
 console.log('Etcd peers:', process.env.ETCD_ENDPOINTS);
 
-var etcd = new Etcd(endpoints,  sslopts);
+if (ssl)
+  var etcd = new Etcd(endpoints,  sslopts);
+else
+  var etcd = new Etcd(endpoints);
 
 // mixin some useful methods
 function deepFindKeys(node, regexp) {