call the callback with an error if admin join fails

index.js

@@ -197,7 +197,7 @@ RingPop.prototype.bootstrap = function bootstrap(bootstrapFile, callback) {
                 err: err.message,
                 address: self.hostPort
             });
-            if (callback) callback(new Error(failedMsg));
+            if (callback) callback(err);
             return;
         }
 

lib/swim.js

@@ -17,6 +17,15 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
+var TypedError = require('error/typed');
+
+var NoHostsError = TypedError({
+    message: 'Could not find any hosts in bootstrap to join.\n' +
+        'Try adding more bootstrapHosts.\n',
+    type: 'ringpop.swim.no-hosts',
+    bootstrapHosts: null
+});
+
 var safeParse = require('./util').safeParse;
 
 function AdminJoiner(params) {
@@ -50,6 +59,11 @@ AdminJoiner.prototype.selectCandidateHosts = function selectCandidateHosts() {
 AdminJoiner.prototype.sendJoin = function sendJoin() {
     if (this.candidateHosts.length === 0) {
         this.ringpop.logger.warn('no hosts in bootstrap set to join');
+        if (this.callback) {
+            this.callback(NoHostsError({
+                bootstrapHosts: this.ringpop.bootstrapHosts
+            }));
+        }
         return;
     }
 

test/integration/admin_join_test.js

@@ -0,0 +1,17 @@
+var test = require('tape');
+
+var allocRingpop = require('../lib/alloc-ringpop.js');
+
+test('bootstrap with self', function t(assert) {
+    var ringpop = allocRingpop();
+
+    ringpop.bootstrap([ringpop.hostPort], onBootstrap);
+
+    function onBootstrap(err) {
+        assert.ok(err);
+        assert.equal(err.type, 'ringpop.swim.no-hosts');
+
+        ringpop.destroy();
+        assert.end();
+    }
+});

test/integration/index.js

@@ -23,3 +23,4 @@ require('./handle_or_proxy_test.js');
 require('./lookup_self_test.js');
 require('./proxy_req_test.js');
 require('./request_proxy_test.js');
+require('./admin_join_test.js');