Remove service-runner as a dependency

The use in ParsoidConfig was added in 60eaa76 for lib/index.js, which doesn't exist anymore. Launching a server with serviceWrapper.js doesn't make sense anymore, now that the js http server has been removed. Reducing the dependencies avoids a lot of pain in trying to keep packages up to date with security fixes. Change-Id: I6cfbc32b73451380a344671a81e7b7a3195aebca
wikimedia · Apr 21, 2022 · b2410c2 · b2410c2
1 parent 633a21b
commit b2410c2
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 1,040 deletions.
diff --git a/bin/langconv-test.js b/bin/langconv-test.js
@@ -539,25 +539,12 @@ if (require.main === module) {
 		}
 		const title = String(argv._[0]);
 		const lang = String(argv._[1]);
-		let ret = null;
 		if (argv.record || argv.replay) {
 			// Don't fork a separate server if record/replay
 			argv.useServer = false;
 		}
 		if (argv.useServer && !argv.parsoidURL) {
-			// Start our own Parsoid server
-			const serviceWrapper = require('../tests/serviceWrapper.js');
-			const serverOpts = {
-				logging: { level: 'info' },
-			};
-			if (argv.apiURL) {
-				serverOpts.mockURL = argv.apiURL;
-				argv.domain = 'customwiki';
-			} else {
-				serverOpts.skipMock = true;
-			}
-			ret = yield serviceWrapper.runServices(serverOpts);
-			argv.parsoidURL = ret.parsoidURL;
+			throw new Error('No parsoidURL provided!');
 		}
 		const formatter =
 			ScriptUtils.booleanOption(argv.silent) ? silentFormat :
@@ -606,9 +593,6 @@ if (require.main === module) {
 				}
 			}
 		}
-		if (ret !== null) {
-			yield ret.runner.stop();
-		}
 		if (argv.check || exitCode > 1) {
 			process.exit(exitCode);
 		}

diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
@@ -909,25 +909,8 @@ if (require.main === module) {
 		}
 		var title = String(argv._[0]);
 
-		var ret = null;
 		if (!argv.parsoidURL) {
-			// Start our own Parsoid server
-			var serviceWrapper = require('../tests/serviceWrapper.js');
-			var serverOpts = {
-				logging: { level: 'info' },
-				parsoidOptions: {
-					loadWMF: true,
-					useSelser: true,
-				}
-			};
-			if (argv.apiURL) {
-				serverOpts.mockURL = argv.apiURL;
-				argv.domain = 'customwiki';
-			} else {
-				serverOpts.skipMock = true;
-			}
-			ret = yield serviceWrapper.runServices(serverOpts);
-			argv.parsoidURL = ret.parsoidURL;
+			throw new Error('No parsoidURL provided!');
 		}
 		argv.parsoidURLOpts = { baseUrl: argv.parsoidURL };
 		if (argv.proxyURL) {
@@ -936,9 +919,6 @@ if (require.main === module) {
 		var formatter = ScriptUtils.booleanOption(argv.xml) ? xmlFormat : plainFormat;
 		var r = yield runTests(title, argv, formatter);
 		console.log(r.output);
-		if (ret !== null) {
-			yield ret.runner.stop();
-		}
 		if (argv.check) {
 			process.exit(r.exitCode);
 		}

diff --git a/lib/config/ParsoidConfig.js b/lib/config/ParsoidConfig.js
@@ -12,7 +12,6 @@ require('../../core-upgrade.js');
 var fs = require('fs');
 var path = require('path');
 var url = require('url');
-var ServiceRunner = require('service-runner');
 
 var Util = require('../utils/Util.js').Util;
 var JSUtils = require('../utils/jsutils.js').JSUtils;
@@ -158,19 +157,6 @@ function ParsoidConfig(localSettings, options) {
 		}
 	}, this);
 
-	if (options.parent && (!this.loggerBackend || !this.metrics)) {
-		var srlogger = ServiceRunner.getLogger(options.parent.logging);
-		if (!this.loggerBackend) {
-			this.loggerBackend = function(logData, cb) {
-				srlogger.log(logData.logType, prepareLog(logData));
-				cb();
-			};
-		}
-		if (!this.metrics) {
-			this.metrics = ServiceRunner.getMetrics(options.parent.metrics, srlogger);
-		}
-	}
-
 	if (!localSettings && options.localsettings) {
 		localSettings = require(options.localsettings);
 	}