wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-15 18:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Added support for localsettings.js and improved logging of instance status"

Browse source
This commit is contained in:
GWicke 2012-06-21 23:53:00 +00:00 committed by Gerrit Code Review
parent b560924467 9f54bbfbfe
commit a0d432bcd3
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -4,4 +4,5 @@
.*.swp .*.swp
api/npm-debug.log api/npm-debug.log
modules/parser/node_modules/ modules/parser/node_modules/
api/localsettings.js

47
api/ParserService.js
View file

@ -1,5 +1,15 @@
/** /**
* A very basic parser / serializer web service. * A very basic parser / serializer web service.
*
* Local configuration:
*
* To configure locally, add localsettings.js to this directory and export a setup function.
*
* @example
* exports.setup = function( config, env ) {
* config.defaultInterwiki = 'localhost';
* env.addInterwiki( 'localhost', 'http://localhost/mediawiki' );
* };
*/ */
/** /**
@ -8,13 +18,10 @@
* Could move this to a separate file later. * Could move this to a separate file later.
*/ */
// default to en.wikipedia.org var config = {
//var defaultInterwiki = 'en'; // MediaWiki.org
// alternative: default to www.mediawiki.org 'defaultInterwiki': 'mw'
// Use this in production for now };
var defaultInterwiki = 'mw';
// for development: default to localhost
//var defaultInterwiki = 'localhost';
/** /**
* End config section * End config section
@ -23,10 +30,17 @@ var defaultInterwiki = 'mw';
// global includes // global includes
var express = require('express'), var express = require('express'),
jsDiff = require('diff'), jsDiff = require('diff'),
html5 = require('html5'); html5 = require('html5'),
path = require('path'),
cluster = require('cluster');
// local includes // local includes
var mp = '../modules/parser/'; var mp = '../modules/parser/',
lsp = __dirname + '/localsettings.js';
var instanceName = cluster.isWorker ? 'worker(' + process.pid + ')' : 'master';
console.log( ' - ' + instanceName + ' loading...' );
var ParserPipelineFactory = require(mp + 'mediawiki.parser.js').ParserPipelineFactory, var ParserPipelineFactory = require(mp + 'mediawiki.parser.js').ParserPipelineFactory,
ParserEnv = require(mp + 'mediawiki.parser.environment.js').MWParserEnvironment, ParserEnv = require(mp + 'mediawiki.parser.environment.js').MWParserEnvironment,
@ -48,8 +62,11 @@ var env = new ParserEnv( {
// add mediawiki.org // add mediawiki.org
env.addInterwiki( 'mw', 'http://www.mediawiki.org/w' ); env.addInterwiki( 'mw', 'http://www.mediawiki.org/w' );
// For development:
env.addInterwiki( 'localhost', 'http://localhost/w' ); // Apply local settings
if (path.existsSync(lsp)) {
require('./localsettings').setup( config, env );
}
var parserPipelineFactory = new ParserPipelineFactory( env ); var parserPipelineFactory = new ParserPipelineFactory( env );
//var parser = parserPipelineFactory.makePipeline( 'text/x-mediawiki/full' ); //var parser = parserPipelineFactory.makePipeline( 'text/x-mediawiki/full' );
@ -289,7 +306,7 @@ app.get( new RegExp('/_rt/(?:(?:(?:' + env.interwikiRegexp + '):+)?(' + env.inte
env.wgScript = env.interwikiMap[req.params[0]]; env.wgScript = env.interwikiMap[req.params[0]];
} else { } else {
env.wgScriptPath = '/_rt/'; env.wgScriptPath = '/_rt/';
env.wgScript = env.interwikiMap[defaultInterwiki]; env.wgScript = env.interwikiMap[config.defaultInterwiki];
} }
if ( env.pageName === 'favicon.ico' ) { if ( env.pageName === 'favicon.ico' ) {
@ -315,7 +332,7 @@ app.get( new RegExp('/_rtve/(?:(?:(?:' + env.interwikiRegexp + '):+)?(' + env.in
env.wgScript = env.interwikiMap[req.params[0]]; env.wgScript = env.interwikiMap[req.params[0]];
} else { } else {
env.wgScriptPath = '/_rtve/'; env.wgScriptPath = '/_rtve/';
env.wgScript = env.interwikiMap[defaultInterwiki]; env.wgScript = env.interwikiMap[config.defaultInterwiki];
} }
if ( env.pageName === 'favicon.ico' ) { if ( env.pageName === 'favicon.ico' ) {
@ -368,7 +385,7 @@ app.get(new RegExp( '/(?:(?:(?:' + env.interwikiRegexp + '):+)?(' + env.interwik
env.wgScript = env.interwikiMap[req.params[0]]; env.wgScript = env.interwikiMap[req.params[0]];
} else { } else {
env.wgScriptPath = '/'; env.wgScriptPath = '/';
env.wgScript = env.interwikiMap[defaultInterwiki]; env.wgScript = env.interwikiMap[config.defaultInterwiki];
} }
if ( env.pageName === 'favicon.ico' ) { if ( env.pageName === 'favicon.ico' ) {
res.end( 'no favicon yet..'); res.end( 'no favicon yet..');
@ -398,4 +415,6 @@ app.post(/\/(.*)/, function(req, res){
res.end(''); res.end('');
}); });
console.log( ' - ' + instanceName + ' ready' );
module.exports = app; module.exports = app;