yakuza0 2.22.20 → 2.22.21-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/server/mode/start.js +6 -2
- package/server/proxy/csrf.js +2 -1
package/package.json
CHANGED
package/server/mode/start.js
CHANGED
|
@@ -8,6 +8,10 @@ var _regenerator = require('babel-runtime/regenerator');
|
|
|
8
8
|
|
|
9
9
|
var _regenerator2 = _interopRequireDefault(_regenerator);
|
|
10
10
|
|
|
11
|
+
var _extends2 = require('babel-runtime/helpers/extends');
|
|
12
|
+
|
|
13
|
+
var _extends3 = _interopRequireDefault(_extends2);
|
|
14
|
+
|
|
11
15
|
var _promise = require('babel-runtime/core-js/promise');
|
|
12
16
|
|
|
13
17
|
var _promise2 = _interopRequireDefault(_promise);
|
|
@@ -100,10 +104,10 @@ exports.default = function () {
|
|
|
100
104
|
_pm2.default.start({
|
|
101
105
|
name: processName,
|
|
102
106
|
script: _paths2.default.ykRoot + 'bin/yk.js s lite',
|
|
103
|
-
env: {
|
|
107
|
+
env: (0, _extends3.default)({
|
|
104
108
|
NODE_ENV: "production",
|
|
105
109
|
config: config
|
|
106
|
-
},
|
|
110
|
+
}, process.env),
|
|
107
111
|
logDateFormat: 'YYYY-MM-DD HH:mm Z',
|
|
108
112
|
output: output,
|
|
109
113
|
error: error,
|
package/server/proxy/csrf.js
CHANGED
|
@@ -437,7 +437,8 @@ exports.default = function () {
|
|
|
437
437
|
// noCache(ctx);
|
|
438
438
|
clnInitCache(ctx);
|
|
439
439
|
// const str = paths.read(ycp.confServer);
|
|
440
|
-
|
|
440
|
+
// global.__yk_cln_init_server__ = __yk_cln_init_server__ || paths.read(ycp.confServer)
|
|
441
|
+
_server.global.__yk_cln_init_server__ = _paths2.default.read(ycp.confServer);
|
|
441
442
|
ctx.status = 200;
|
|
442
443
|
ctx.body = _server.global.__yk_cln_init_server__;
|
|
443
444
|
_context2.next = 18;
|