droonga/droonga-http-server at 7fe4bb1 [master] Remove obsolete codes. (Groonga-commit) - Groonga - fulltext search engine.

SHIMODA "Piro" Hiroshi	2014-11-02 02:07:22 +0900 (Sun, 02 Nov 2014)

  New Revision: 7fe4bb15b39c7328bf6ba52fe1666270fe11b8af
  https://github.com/droonga/droonga-http-server/commit/7fe4bb15b39c7328bf6ba52fe1666270fe11b8af

  Message:
    Remove obsolete codes.
    
    Serf-related codes are moved to express-droonga.

  Removed files:
    bin/droonga-http-server-report-live-engine-hosts
    lib/serf/client.js
  Modified files:
    package.json

  Deleted: bin/droonga-http-server-report-live-engine-hosts (+0 -24) 100755
===================================================================

--- bin/droonga-http-server-report-live-engine-hosts    2014-10-31 19:38:03 +0900 (91232ab)
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env node
-// -*- js -*-
-var SerfClient = require('../lib/serf/client');
-
-var options = require('../lib/server-options');
-options = options.define().parse(process.argv);
-
-var client = new SerfClient({
-  host:       options.droongaEngineHostName,
-  enginePort: options.droongaEnginePort,
-  tag:        options.tag
-});
-
-client.getLiveEngineNodes()
-  .then(function(members) {
-    members.forEach(function(member) {
-      console.log(member.HostName);
-    });
-    process.exit(true);
-  })
-  .catch(function(error) {
-    console.error(error);
-    process.exit(false);
-  });

  Deleted: lib/serf/client.js (+0 -102) 100644
===================================================================
--- lib/serf/client.js    2014-10-31 19:38:03 +0900 (9cc9494)
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * usage:
- *   var Client = require('lib/serf/client');
- *   var serf = new Client({
- *                host:       'node0', // host name that the serf agent is working
- *                tag:        'droonga', // tag of engines, can be omitted
- *                enginePort: 10031 // port number of engines, can be omitted
- *              });
- *   serf.getAllMembers()
- *         .then(function(members) { console.log(members); })
- *         // members:
- *         //   [{ Name:     'node0:10031/droonga',
- *         //      Port:     7946,
- *         //      Status:   'alive', ... }, ...]
- *         .catch(function(e) { console.error(e); });
- *   serf.getLiveEngineNodes()
- *         .then(function(members) { console.log(members); })
- *         // members:
- *         //   [{ Name:     'node0:10031/droonga',
- *         //      Port:     7946,
- *         //      Status:   'alive',
- *         //      HostName: 'node0', ... }, ...]
- *         .catch(function(e) { console.error(e); });
- */
-
-var SerfRPC = require('serf-rpc'),
-    Q       = require('q');
-
-var ENGINE_NODE_NAME_PATTERN = /^([^:]+):(\d+)\/(.+)$/;
-
-function Client(options) {
-  options = options || {};
-
-  this._droongaHost       = options.host || '127.0.0.1';
-  this._droongaEnginePort = options.enginePort || 10031;
-  this._droongaTag        = options.tag || 'droonga';
-
-  this._connectionOptions = {
-    rpc_host: this._droongaHost,
-    rpc_port: 7373
-  };
-  this._client = new SerfRPC();
-  this._connected = false;
-}
-Client.prototype = {
-  connect: function() {
-    return Q.Promise((function(resolve, reject, notify) {
-      if (this._connected)
-        return resolve();
-
-      this._client.connect(this._connectionOptions, (function(error) {
-        if (error)
-          return reject(error);
-        this._connected = true;
-        resolve();
-      }).bind(this));
-    }).bind(this));
-  },
-
-  joinTo: function(existingMemberHostName) {
-    return this.connect().then((function() {
-      return Q.Promise((function(resolve, reject, notify) {
-        this._client.join({
-          Existing: [existingMemberHostName + ':7946'],
-          Replay:   false
-        }, function(error, result) {
-          if (error)
-            return reject(error);
-          resolve();
-        });
-      }).bind(this));
-    }).bind(this));
-  },
-
-  getAllMembers: function() {
-    return this.connect().then((function() {
-      return Q.Promise((function(resolve, reject, notify) {
-        this._client.members(function(error, result) {
-          if (error)
-            return reject(error);
-          resolve(result.Members);
-        });
-      }).bind(this));
-    }).bind(this));
-  },
-
-  getLiveEngineNodes: function() {
-    return this.getAllMembers().then((function(members) {
-      return members.filter(function(member) {
-        var matched = String(member.Name).match(ENGINE_NODE_NAME_PATTERN);
-        if (matched)
-          member.HostName = matched[1];
-        return matched &&
-                 matched[2] == this._droongaEnginePort &&
-                 matched[3] == this._droongaTag &&
-                 member.Status == 'alive';
-      }, this);
-    }).bind(this));
-  }
-};
-
-module.exports = Client;

  Modified: package.json (+1 -3)
===================================================================
--- package.json    2014-10-31 19:38:03 +0900 (9b1d800)
+++ package.json    2014-11-02 02:07:22 +0900 (3b48414)
@@ -33,15 +33,13 @@
     "ps-node": "*",
     "q": "*",
     "response-time": "*",
-    "serf-rpc": "*",
     "touch": "*",
     "uid-number": "*",
     "winston": "*"
   },
   "bin": {
     "droonga-http-server": "./bin/droonga-http-server",
-    "droonga-http-server-configure": "./bin/droonga-http-server-configure",
-    "droonga-http-server-report-live-engine-hosts": "./bin/droonga-http-server-report-live-engine-hosts"
+    "droonga-http-server-configure": "./bin/droonga-http-server-configure"
   },
   "main": "index",
   "engines": {
-------------- next part --------------
HTML����������������������������...
Télécharger 


Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-http-server at 7fe4bb1 [master] Remove obsolete codes.