THRIFT-2398:Improve Node Server Library\nClient: Node\nPatch: Randy Abernethy\n\nGeneral server parameter harmonization and comments
diff --git a/lib/nodejs/test/server.js b/lib/nodejs/test/server.js
index acc0398..6f5abe6 100644
--- a/lib/nodejs/test/server.js
+++ b/lib/nodejs/test/server.js
@@ -25,13 +25,10 @@
var fs = require('fs');
var path = require('path');
var thrift = require('thrift');
-var ThriftTransports = require('thrift/transport');
-var ThriftProtocols = require('thrift/protocol');
var ThriftTest = require('./gen-nodejs/ThriftTest');
var ThriftTestHandler = require('./test_handler').ThriftTestHandler;
var ThriftTestHandlerPromise = require('./test_handler_promise').ThriftTestHandler;
-
var program = require('commander');
program
@@ -41,46 +38,30 @@
.option('--promise', 'test with promise style functions')
.parse(process.argv);
-var protocol = undefined;
-var transport = undefined;
-var handler = undefined;
-
-if (program.protocol === "binary") {
- protocol = ThriftProtocols.TBinaryProtocol;
-} else if (program.protocol === "json") {
- protocol = ThriftProtocols.TJSONProtocol;
-} else {
- //default
- protocol = ThriftProtocols.TBinaryProtocol;
-}
-
+var transport = thrift.TBufferedTransport;
if (program.transport === "framed") {
- transport = ThriftTransports.TFramedTransport;
-} else if (program.transport === "buffered") {
- transport = ThriftTransports.TBufferedTransport;
-} else {
- //default
- transport = ThriftTransports.TBufferedTransport;
-}
+ transport = thrift.TFramedTransport;
+}
+var protocol = thrift.TBinaryProtocol;
+if (program.protocol === "json") {
+ protocol = thrift.TJSONProtocol;
+}
+
+var handler = ThriftTestHandler;
if (program.promise) {
handler = ThriftTestHandlerPromise;
-} else {
- handler = ThriftTestHandler;
-}
+}
var options = {
protocol: protocol,
transport: transport
};
-
if (program.ssl) {
- //ssl options
- options.key = fs.readFileSync(path.resolve(__dirname, 'server.key'));
- options.cert = fs.readFileSync(path.resolve(__dirname, 'server.crt'));
- thrift.createSSLServer(ThriftTest, handler, options).listen(9090);
-
-} else {
- //default
- thrift.createServer(ThriftTest, handler, options).listen(9090);
+ options.tls = {
+ key: fs.readFileSync(path.resolve(__dirname, 'server.key')),
+ cert: fs.readFileSync(path.resolve(__dirname, 'server.crt'))
+ }
}
+thrift.createServer(ThriftTest, handler, options).listen(9090);
+