cloudcms-server 3.2.344 → 3.2.346
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/index.js +2 -2
- package/package.json +1 -1
- package/server/index.js +11 -6
package/index.js
CHANGED
|
@@ -63,8 +63,8 @@ var Gitana = require("gitana");
|
|
|
63
63
|
// default keep alive (3 minutes)
|
|
64
64
|
process.defaultKeepAliveMs = (3 * 60 * 1000);
|
|
65
65
|
|
|
66
|
-
// default http timeout (
|
|
67
|
-
process.defaultHttpTimeoutMs =
|
|
66
|
+
// default http timeout (10 minutes)
|
|
67
|
+
process.defaultHttpTimeoutMs = 10 * 60 * 1000;
|
|
68
68
|
|
|
69
69
|
// default exclusive lock timeout (2 minutes)
|
|
70
70
|
process.defaultExclusiveLockTimeoutMs = 2 * 60 * 1000;
|
package/package.json
CHANGED
package/server/index.js
CHANGED
|
@@ -1197,7 +1197,10 @@ var createHttpServer = function(app, done)
|
|
|
1197
1197
|
}
|
|
1198
1198
|
}
|
|
1199
1199
|
serverConfig.keepAliveTimeout = process.defaultKeepAliveMs;
|
|
1200
|
-
serverConfig.requestTimeout = process.
|
|
1200
|
+
serverConfig.requestTimeout = process.defaultHttpTimeoutMs;
|
|
1201
|
+
|
|
1202
|
+
console.log("Server Config - keepAliveTimeout: " + serverConfig.keepAliveTimeout);
|
|
1203
|
+
console.log("Server Config - requestTimeout: " + serverConfig.requestTimeout);
|
|
1201
1204
|
|
|
1202
1205
|
if (process.configuration.https)
|
|
1203
1206
|
{
|
|
@@ -1218,12 +1221,14 @@ var createHttpServer = function(app, done)
|
|
|
1218
1221
|
}
|
|
1219
1222
|
|
|
1220
1223
|
// request timeout
|
|
1221
|
-
var requestTimeoutMs =
|
|
1222
|
-
if (process.configuration && process.configuration.timeout)
|
|
1223
|
-
{
|
|
1224
|
-
|
|
1225
|
-
}
|
|
1224
|
+
// var requestTimeoutMs = serverConfig.requestTimeout;
|
|
1225
|
+
// if (process.configuration && process.configuration.timeout)
|
|
1226
|
+
// {
|
|
1227
|
+
// requestTimeoutMs = process.configuration.timeout;
|
|
1228
|
+
// }
|
|
1229
|
+
var requestTimeoutMs = serverConfig.requestTimeout;
|
|
1226
1230
|
httpServer.setTimeout(requestTimeoutMs, function(socket) {
|
|
1231
|
+
console.log("A1: Request Timeout: " + requestTimeoutMs);
|
|
1227
1232
|
try { socket.end(); } catch (e) { }
|
|
1228
1233
|
try { socket.destroy(); } catch (e) { }
|
|
1229
1234
|
});
|