[MediaWiki-commits] [Gerrit] Make the server runnable without cluster setup - change (mediawiki...ContentTranslation)

2014-02-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Make the server runnable without cluster setup
..


Make the server runnable without cluster setup

This patch make it possible to run a single process instance

Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
---
M server/ContentTranslationService.js
M server/server.js
2 files changed, 5 insertions(+), 9 deletions(-)

Approvals:
  Santhosh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/server/ContentTranslationService.js 
b/server/ContentTranslationService.js
index b0256ca..d72799a 100644
--- a/server/ContentTranslationService.js
+++ b/server/ContentTranslationService.js
@@ -53,8 +53,8 @@
sourceText = req.body.sourcetext;
 
res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' );
-// TODO: create configurable access control list for production
-res.setHeader( 'Access-Control-Allow-Origin', '*' );
+   // TODO: create configurable access control list for production
+   res.setHeader( 'Access-Control-Allow-Origin', '*' );
res.end( app.translator.translate(
sourceLang,
targetLang,
@@ -67,5 +67,6 @@
 
 console.log( ' - ' + instanceName + ' ready' );
 
-module.exports = app;
+app.listen( config.port );
 
+module.exports = app;
diff --git a/server/server.js b/server/server.js
index aec306a..2aa45c8 100644
--- a/server/server.js
+++ b/server/server.js
@@ -8,8 +8,6 @@
 
 var cluster = require( 'cluster' );
 
-var config = require( __dirname + '/config.js' );
-
 if ( cluster.isMaster ) {
// Start a few more workers than there are cpus visible to the OS, so 
that we
// get some degree of parallelism even on single-core systems. A single
@@ -57,8 +55,5 @@
heapdump.writeSnapshot();
} );
 
-   var app = require( './ContentTranslationService.js' );
-   // when running on appfog.com the listen port for the app
-   // is passed in an environment variable.  Most users can ignore this!
-   app.listen( process.env.VCAP_APP_PORT || config.port );
+   require( './ContentTranslationService.js' );
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/113365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Make the server runnable without cluster setup - change (mediawiki...ContentTranslation)

2014-02-14 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/113365

Change subject: Make the server runnable without cluster setup
..

Make the server runnable without cluster setup

This patch make it possible to run a single process instance

Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
---
M server/ContentTranslationService.js
M server/server.js
2 files changed, 4 insertions(+), 6 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/65/113365/1

diff --git a/server/ContentTranslationService.js 
b/server/ContentTranslationService.js
index b0256ca..d72799a 100644
--- a/server/ContentTranslationService.js
+++ b/server/ContentTranslationService.js
@@ -53,8 +53,8 @@
sourceText = req.body.sourcetext;
 
res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' );
-// TODO: create configurable access control list for production
-res.setHeader( 'Access-Control-Allow-Origin', '*' );
+   // TODO: create configurable access control list for production
+   res.setHeader( 'Access-Control-Allow-Origin', '*' );
res.end( app.translator.translate(
sourceLang,
targetLang,
@@ -67,5 +67,6 @@
 
 console.log( ' - ' + instanceName + ' ready' );
 
-module.exports = app;
+app.listen( config.port );
 
+module.exports = app;
diff --git a/server/server.js b/server/server.js
index aec306a..48b767b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -58,7 +58,4 @@
} );
 
var app = require( './ContentTranslationService.js' );
-   // when running on appfog.com the listen port for the app
-   // is passed in an environment variable.  Most users can ignore this!
-   app.listen( process.env.VCAP_APP_PORT || config.port );
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/113365
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I587ba30a08dd2970283d737eb4928c08926c7ac6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits