mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-08 16:05:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Removed requests and moved to axios.

Browse source
This commit is contained in:
SamTV12345 2023-06-25 20:27:06 +02:00
parent 1ec3b37eb5
commit becac7c294
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/package.json
View file

@ -103,8 +103,7 @@
"scripts": { "scripts": {
"lint": "eslint .", "lint": "eslint .",
"test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs", "test": "mocha --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
"test-container": "mocha --timeout 5000 tests/container/specs/api", "test-container": "mocha --timeout 5000 tests/container/specs/api"
"dev": "bash ./bin/run.sh"
}, },
"version": "1.9.3", "version": "1.9.3",
"license": "Apache-2.0" "license": "Apache-2.0"

3
src/tests/backend/common.js
View file

@ -42,8 +42,6 @@ exports.init = async function () {
if (!logLevel.isLessThanOrEqualTo(log4js.levels.DEBUG)) { if (!logLevel.isLessThanOrEqualTo(log4js.levels.DEBUG)) {
logger.warn('Disabling non-test logging for the duration of the test. ' + logger.warn('Disabling non-test logging for the duration of the test. ' +
'To enable non-test logging, change the loglevel setting to DEBUG.'); 'To enable non-test logging, change the loglevel setting to DEBUG.');
log4js.setGlobalLogLevel(log4js.levels.OFF);
logger.setLevel(logLevel);
} }
// Note: This is only a shallow backup. // Note: This is only a shallow backup.
@ -66,7 +64,6 @@ exports.init = async function () {
webaccess.authnFailureDelayMs = backups.authnFailureDelayMs; webaccess.authnFailureDelayMs = backups.authnFailureDelayMs;
// Note: This does not unset settings that were added. // Note: This does not unset settings that were added.
Object.assign(settings, backups.settings); Object.assign(settings, backups.settings);
log4js.setGlobalLogLevel(logLevel);
await server.exit(); await server.exit();
}); });