YUKI Hiroshi
null+****@clear*****
Fri Mar 28 17:24:59 JST 2014
YUKI Hiroshi 2014-03-28 17:24:59 +0900 (Fri, 28 Mar 2014) New Revision: 1eb31b83b659e1f812d30993280886ea848e2e8e https://github.com/droonga/droonga-http-server/commit/1eb31b83b659e1f812d30993280886ea848e2e8e Message: Unify application.jsto bin/droonga-http-server Removed files: application.js Modified files: bin/droonga-http-server Deleted: application.js (+0 -67) 100755 =================================================================== --- application.js 2014-03-28 16:49:35 +0900 (1d61a22) +++ /dev/null @@ -1,67 +0,0 @@ -var express = require('express'), - droonga = require('express-droonga'), - responseTime = require('response-time'), - http = require('http'), - options = require('commander'); - -var version = require('./package.json').version; - -options - .version(version) - .option('--port <port>', 'Port number', parseInt, 13000) - .option('--receive-host-name <name>', - 'Host name of the protocol adapter. ' + - 'It must be resolvable by Droonga engine.', - '127.0.0.1') - .option('--droonga-engine-host-name <name>', 'Host name of Droonga engine', - '127.0.0.1') - .option('--droonga-engine-port <port>', 'Port number of Droonga engine', - parseInt, 24224) - .option('--default-dataset <dataset>', 'The default dataset', - 'Droonga') - .option('--enable-logging', 'Enable logging to the standard output') - .option('--cache-size <size>', 'The max number of cached requests', - parseInt, 100) - .parse(process.argv); - -var application = express(); -var server = http.createServer(application); - -var MemoryStore = express.session.MemoryStore; -var sessionStore = new MemoryStore(); -application.configure(function() { - if (options.enableLogging) { - application.use(express.logger()); - } - application.use(express.cookieParser('secret key')); - application.use(express.session({ - secret: 'secret key', - store: sessionStore - })); - application.use(responseTime()); - if (options.cacheSize > 0) { - application.use(droonga.cache({ - size: options.cacheSize, - rules: [ - { regex: /./ } - ] - })); - } -}); - -application.droonga({ - prefix: '', - defaultDataset: options.defaultDataset, - server: server, - sessionStore: sessionStore, // this is required to share session information HTTP APIs - receiveHostName: options.receiveHostName, - hostName: options.droongaEngineHostName, - port: options.droongaEnginePort, - plugins: [ - droonga.API_REST, - droonga.API_GROONGA, - droonga.API_DROONGA - ] -}); - -server.listen(options.port); Modified: bin/droonga-http-server (+66 -6) =================================================================== --- bin/droonga-http-server 2014-03-28 16:49:35 +0900 (8afbff3) +++ bin/droonga-http-server 2014-03-28 17:24:59 +0900 (7f89f73) @@ -1,9 +1,69 @@ -#!/bin/sh +#!/usr/bin/env node -set -e -set -u +var express = require('express'), + droonga = require('express-droonga'), + responseTime = require('response-time'), + http = require('http'), + options = require('commander'); -root_dir=$(cd $(dirname $0)/.. && pwd) -cd $root_dir +var version = require('../package.json').version; -exec node application.js "$@" +options + .version(version) + .option('--port <port>', 'Port number', parseInt, 13000) + .option('--receive-host-name <name>', + 'Host name of the protocol adapter. ' + + 'It must be resolvable by Droonga engine.', + '127.0.0.1') + .option('--droonga-engine-host-name <name>', 'Host name of Droonga engine', + '127.0.0.1') + .option('--droonga-engine-port <port>', 'Port number of Droonga engine', + parseInt, 24224) + .option('--default-dataset <dataset>', 'The default dataset', + 'Droonga') + .option('--enable-logging', 'Enable logging to the standard output') + .option('--cache-size <size>', 'The max number of cached requests', + parseInt, 100) + .parse(process.argv); + +var application = express(); +var server = http.createServer(application); + +var MemoryStore = express.session.MemoryStore; +var sessionStore = new MemoryStore(); +application.configure(function() { + if (options.enableLogging) { + application.use(express.logger()); + } + application.use(express.cookieParser('secret key')); + application.use(express.session({ + secret: 'secret key', + store: sessionStore + })); + application.use(responseTime()); + if (options.cacheSize > 0) { + application.use(droonga.cache({ + size: options.cacheSize, + rules: [ + { regex: /./ } + ] + })); + } +}); + +application.droonga({ + prefix: '', + defaultDataset: options.defaultDataset, + server: server, + sessionStore: sessionStore, // this is required to share session information HTTP APIs + receiveHostName: options.receiveHostName, + hostName: options.droongaEngineHostName, + port: options.droongaEnginePort, + plugins: [ + droonga.API_REST, + droonga.API_GROONGA, + droonga.API_DROONGA + ] +}); + +server.listen(options.port); -------------- next part -------------- HTML����������������������������...Download