crabatool 1.0.367 → 1.0.368
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/lib/handler.js +1 -1
- package/lib/server.js +7 -2
- package/package.json +1 -1
package/lib/handler.js
CHANGED
|
@@ -25,7 +25,7 @@ class Handler {
|
|
|
25
25
|
// 从server目录下找api实现
|
|
26
26
|
if (apiPath.indexOf('/') > 0) {
|
|
27
27
|
var name = apiPath.substr(0, apiPath.indexOf('/'));
|
|
28
|
-
var apiJs = path.join(
|
|
28
|
+
var apiJs = path.join(req.app.webPath, '../', apiStart, name + ".js");
|
|
29
29
|
if (!fs.existsSync(apiJs)) {
|
|
30
30
|
return next();
|
|
31
31
|
}
|
package/lib/server.js
CHANGED
|
@@ -97,6 +97,9 @@ function createServer(app, options) {
|
|
|
97
97
|
if (options) {
|
|
98
98
|
webPath = options.webPath;
|
|
99
99
|
}
|
|
100
|
+
|
|
101
|
+
app.webPath = webPath; // handler.js里面动态获取当前app的网站路径（多个server实例的时候需要）
|
|
102
|
+
|
|
100
103
|
app.use(express.static(webPath, {
|
|
101
104
|
maxage: '100h', // 强制缓存资源
|
|
102
105
|
setHeaders: function(res, pathname, stat) {
|
|
@@ -188,7 +191,7 @@ function createServer(app, options) {
|
|
|
188
191
|
|
|
189
192
|
// 有新的请求时初始化计时器
|
|
190
193
|
server.on("request", (req, res) => {
|
|
191
|
-
resetTimeout(server);
|
|
194
|
+
resetTimeout(server);
|
|
192
195
|
});
|
|
193
196
|
|
|
194
197
|
// 记录所有活跃连接
|
|
@@ -247,7 +250,9 @@ function forceShutdown(server, cb) {
|
|
|
247
250
|
delete server.__connections;
|
|
248
251
|
delete servers[server.__serverid];
|
|
249
252
|
|
|
250
|
-
console.log('
|
|
253
|
+
console.log('server已强制下线：' + server.__serverid);
|
|
254
|
+
|
|
255
|
+
console.log('当前server实例总数:' + exports.count());
|
|
251
256
|
|
|
252
257
|
if (typeof cb == 'function') {
|
|
253
258
|
cb();
|