listen to process.env.PORT

mdn · Dec 10, 2015 · 9279bfc · 9279bfc
1 parent 653d831
commit 9279bfc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/kumascript_settings_local.json b/kumascript_settings_local.json
@@ -0,0 +1,27 @@
+{
+    "log": {
+        "console": true
+    },
+    "server": {
+        "port": 9080,
+        "numWorkers": 4,
+        "workerTimeout": 10000,
+        "memcache": {
+            "server": {"127.0.0.1:11211": 1},
+            "options": { }
+        },
+        "macro_timeout": 60000,
+        "document_url_template": "https://localhost/en-US/docs/{path}?raw=1",
+        "template_url_template": "https://localhost/en-US/docs/en-US/Template:{name}?raw=1",
+        "template_class": "EJSTemplate",
+        "autorequire": {
+            "mdn": "MDN:Common",
+            "Date": "DekiScript:Date",
+            "Page": "DekiScript:Page",
+            "String": "DekiScript:String",
+            "Uri": "DekiScript:Uri",
+            "Web": "DekiScript:Web",
+            "Wiki": "DekiScript:Wiki"
+        }
+    }
+}
diff --git a/lib/kumascript/conf.js b/lib/kumascript/conf.js
@@ -27,7 +27,7 @@ var DEFAULT_CONFIG = {
         }
     },
     server: {
-        port: 9080,
+        port: 80,
         numWorkers: 4,
         workerConcurrency: 4,
         workerTimeout: 1000 * 60,
@@ -40,7 +40,7 @@ var DEFAULT_CONFIG = {
         template_cache_control: 'max-age=3600'
     },
     repl: {
-        enabled: true,
+        enabled: false,
         host: "127.0.0.1",
         port: 9070
     }

diff --git a/lib/kumascript/server.js b/lib/kumascript/server.js
@@ -42,7 +42,7 @@ var Server = ks_utils.Class({
     // Service accepts these options:
     default_options: {
         // Port on which the HTTP service will listen.
-        port: 9000,
+        port: 9080,
         // Template used to resolve incoming URL paths to document source URLs.
         document_url_template: "http://localhost:9001/docs/{path}?raw=1",
         // Template used to resolve macro names to URLs for the loader.
@@ -135,7 +135,8 @@ var Server = ks_utils.Class({
 
     // Start the service listening
     listen: function (port) {
-        port = port || this.options.port;
+        port = process.env.PORT || 9080;
+        log.info("Server.listen(" + port + ")");
         this.app.listen(port);
     },