@@ -29,20 +29,11 @@ const koaStatic = require('koa-static');
2929const koaWebpack = require ( 'koa-webpack' ) ;
3030const webpack = require ( 'webpack' ) ;
3131const jwt = require ( 'jsonwebtoken' ) ;
32-
3332const webpackConfig = require ( '../webpack.config' ) ;
3433const grpcClient = require ( './middleware/grpc-client' ) ;
3534const tchannelClient = require ( './middleware/tchannel-client' ) ;
3635const router = require ( './router' ) ;
37- const {
38- PEERS_DEFAULT ,
39- REQUEST_RETRY_FLAGS_DEFAULT ,
40- REQUEST_RETRY_LIMIT_DEFAULT ,
41- REQUEST_TIMEOUT_DEFAULT ,
42- SERVICE_NAME_DEFAULT ,
43- TRANSPORT_CLIENT_TYPE_DEFAULT ,
44- } = require ( './constants' ) ;
45-
36+ const config = require ( './config/config' ) ;
4637const staticRoot = path . join ( __dirname , '../dist' ) ;
4738const app = new Koa ( ) ;
4839const transportClients = {
@@ -54,18 +45,16 @@ app.webpackConfig = webpackConfig;
5445
5546app . init = function ( {
5647 logErrors,
57- peers = process . env . CADENCE_TCHANNEL_PEERS || PEERS_DEFAULT ,
58- retryFlags = REQUEST_RETRY_FLAGS_DEFAULT ,
59- retryLimit = process . env . CADENCE_TCHANNEL_RETRY_LIMIT ||
60- REQUEST_RETRY_LIMIT_DEFAULT ,
61- serviceName = process . env . CADENCE_TCHANNEL_SERVICE || SERVICE_NAME_DEFAULT ,
62- timeout = REQUEST_TIMEOUT_DEFAULT ,
63- transportClientType = process . env . TRANSPORT_CLIENT_TYPE ||
64- TRANSPORT_CLIENT_TYPE_DEFAULT , // 'tchannel', 'grpc'
65- useWebpack = process . env . NODE_ENV !== 'production' ,
66- enableAuth = process . env . ENABLE_AUTH === 'true' ,
67- authType = process . env . AUTH_TYPE ,
68- authAdminJwtPrivateKey = process . env . AUTH_ADMIN_JWT_PRIVATE_KEY ,
48+ peers = config . peers ,
49+ retryFlags = config . requestConfig . retryFlags ,
50+ retryLimit = config . requestConfig . retryLimit ,
51+ serviceName = config . requestConfig . serviceName ,
52+ timeout = config . requestConfig . timeout ,
53+ transportClientType = config . transportClientType ,
54+ useWebpack = config . useWebpack ,
55+ enableAuth = config . enableAuth ,
56+ authType = config . authType ,
57+ authAdminJwtPrivateKey = config . authAdminJwtPrivateKey ,
6958} = { } ) {
7059 const requestConfig = {
7160 retryFlags,
0 commit comments