rethinkdbdash - npm Package Compare versions

Comparing version 2.0.1 to 2.0.2

lib/helper.js

@@ -116,17 +116,20 @@ var protodef = require(__dirname+'/protodef.js');
         }
-        else if (/^192\.168\.\d{1,3}\.\d{1,3}$/.test(addresse.host)) {
+        else if (/^169\.254\.\d{1,3}\.\d{1,3}$/.test(addresse.host)) {
             addresse.value = 2;
         }
-        else if (/^172\.(1\d|2\d|30|31)\.\d{1,3}\.\d{1,3}$/.test(addresse.host)) {
+        else if (/^192\.168\.\d{1,3}\.\d{1,3}$/.test(addresse.host)) {
             addresse.value = 3;
         }
-        else if (/^10(\.\d{1,3}){3}$/.test(addresse.host)) {
+        else if (/^172\.(1\d|2\d|30|31)\.\d{1,3}\.\d{1,3}$/.test(addresse.host)) {
             addresse.value = 4;
         }
-        else if ((net.isIPv6(addresse.host)) && (/^[fF]|[cCdD].*\:.*\:/.test('addresse.host'))) {
+        else if (/^10(\.\d{1,3}){3}$/.test(addresse.host)) {
             addresse.value = 5;
         }
-        else {
+        else if ((net.isIPv6(addresse.host)) && (/^[fF]|[cCdD].*\:.*\:/.test('addresse.host'))) {
             addresse.value = 6;
         }
+        else {
+            addresse.value = 7;
+        }
     }
@@ -133,0 +136,0 @@ var result = addresses[0];

lib/pool_master.js

@@ -22,3 +22,3 @@ var util = require('util');
     self._indexUnknown =  0 // next unknown pool to used
-    self._discovery = (typeof options.discovery === 'boolean') ? options.discovery: true; // Whether the pool master is in discovery mode or not
+    self._discovery = (typeof options.discovery === 'boolean') ? options.discovery: false; // Whether the pool master is in discovery mode or not
     self._refresh = (typeof options.refresh === 'number') ? options.refresh: 1000*60*60; // Refresh rate for the list of servers
@@ -25,0 +25,0 @@ self._options = options;

package.json

 {
   "name": "rethinkdbdash",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A Node.js driver for RethinkDB with promises and a connection pool",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

README.md

@@ -149,3 +149,3 @@ rethinkdbdash
 - `discovery`: `<boolean>` - When true, the driver will regularly pull data from the table `server_status` to
-keep a list of updated hosts, default `true`
+keep a list of updated hosts, default `false`
 - `pool`: `<boolean>` - Set it to `false`, if you do not want to use a connection pool.
@@ -167,9 +167,9 @@ - `buffer`: `<number>` - Minimum number of connections available in the pool, default `50`
 // connect to localhost:8080, and let the driver find other instances
-var r = require('rethinkdbdash')();
-
-// connect to and only to localhost:8080
 var r = require('rethinkdbdash')({
-    discovery: false
+    discovery: true
 });
 
+// connect to and only to localhost:8080
+var r = require('rethinkdbdash')();
+
 // Do not create a connection pool
@@ -176,0 +176,0 @@ var r = require('rethinkdbdash')({pool: false});

test/pool.js

@@ -73,3 +73,4 @@ var Server = require(__dirname+'/util/fake_server/index.js')
         max: 10,
-        buffer: 5
+        buffer: 5,
+        discovery: true
     });
@@ -121,3 +122,4 @@
         max: 11,
-        buffer: 5
+        buffer: 5,
+        discovery: true
     });
@@ -178,3 +180,4 @@ try {
         max: 9,
-        buffer: 5
+        buffer: 5,
+        discovery: true
     });
@@ -221,3 +224,4 @@ try {
         max: 15*3,
-        buffer: 5*3 
+        buffer: 5*3,
+        discovery: true
     });
@@ -275,3 +279,4 @@ try {
         max: 15*3,
-        buffer: 5*3
+        buffer: 5*3,
+        discovery: true
     });
@@ -432,3 +437,4 @@ try {
         buffer: 4*3,
-        silent: true
+        silent: true,
+        discovery: true
     });
@@ -435,0 +441,0 @@ try {

No alert changes

Improved metrics

Total package byte prevSize

839281

increased by0.03%

Lines of code

23913

increased by0.04%

No dependency changes