@colyseus/tools 0.15.1 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colyseus/tools",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Colyseus Tools for Production",
   "input": "./src/index.ts",
   "main": "./build/index.js",
@@ -10,6 +10,7 @@
     "start": "ts-node-dev example/app.ts"
   },
   "bin": {
+    "colyseus-system-boot": "system-boot.js",
     "colyseus-post-deploy": "post-deploy.js"
   },
   "repository": {
@@ -47,5 +48,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a64293e4e0cba0c7e21f62a9d4b18284a1fd45ea"
+  "gitHead": "3d22fe71a30b78158450f79d091a24ef80494d2c"
 }

package/post-deploy.js

@@ -2,13 +2,11 @@
 const pm2 = require('pm2');
 const os = require('os');
 const fs = require('fs');
-const { exec } = require('child_process');
 
 const opts = { env: process.env.NODE_ENV || "production" };
 const maxCPU = os.cpus().length;
 
 const NGINX_SERVERS_CONFIG_FILE = '/etc/nginx/colyseus_servers.conf';
-const NGINX_LIMITS_CONFIG_FILE = '/etc/nginx/colyseus_limits.conf';
 
 pm2.list(function(err, apps) {
   bailOnErr(err);
@@ -36,30 +34,24 @@ pm2.list(function(err, apps) {
 });
 
 function updateAndReloadNginx() {
-
   pm2.list(function(err, apps) {
     bailOnErr(err);
 
-    // update file descriptor limits systemwide + nginx worker connections
-    updateNOFileConfig(function(err) {
-      bailOnErr(err);
-
-      const port = 2567;
-      const addresses = [];
+    const port = 2567;
+    const addresses = [];
 
-      apps.forEach(function(app) {
-        addresses.push(`127.0.0.1:${ port + app.pm2_env.NODE_APP_INSTANCE }`);
-      });
+    apps.forEach(function(app) {
+      addresses.push(`127.0.0.1:${ port + app.pm2_env.NODE_APP_INSTANCE }`);
+    });
 
-      fs.writeFileSync(NGINX_SERVERS_CONFIG_FILE, addresses.map(address => `server ${address};`).join("\n"), bailOnErr);
+    fs.writeFileSync(NGINX_SERVERS_CONFIG_FILE, addresses.map(address => `server ${address};`).join("\n"), bailOnErr);
 
-      // "pm2 save"
-      pm2.dump(function(err, ret) {
-        bailOnErr(err);
+    // "pm2 save"
+    pm2.dump(function(err, ret) {
+      bailOnErr(err);
 
-        // exit with success!
-        process.exit();
-      });
+      // exit with success!
+      process.exit();
     });
   });
 
@@ -85,37 +77,3 @@ function bailOnErr(err) {
   }
 }
 
-
-function updateNOFileConfig(cb) {
-  // const numCPU = os.cpus().length;
-  const totalmemMB = os.totalmem() / 1024 / 1024;
-  const estimatedCCUPerGB = 4000;
-
-  const maxCCU = (totalmemMB / 1024) * estimatedCCUPerGB;
-  const systemMaxNOFileLimit = maxCCU * 4;
-  const nginxMaxNOFileLimit = maxCCU * 3; // 3x because of nginx -> proxy_pass -> node:port
-
-  // immediatelly apply new nofile limit
-  exec(`ulimit -n ${systemMaxNOFileLimit}`, bailOnErr);
-
-  // update "/etc/security/limits.conf" file.
-  fs.writeFileSync("/etc/security/limits.conf", `
-* - nofile $NOFILE_LIMIT
-`, bailOnErr);
-
-  if (fs.existsSync(NGINX_LIMITS_CONFIG_FILE)) {
-    fs.writeFileSync(NGINX_LIMITS_CONFIG_FILE, `
-worker_rlimit_nofile ${nginxMaxNOFileLimit};
-
-events {
-    worker_connections ${maxCCU};
-    # multi_accept on;
-}
-`, cb);
-    console.log("new nofile limit:", { maxCCU, systemMaxNOFileLimit, nginxMaxNOFileLimit });
-
-  } else {
-    console.warn(NGINX_LIMITS_CONFIG_FILE, "not found.");
-  }
-}
-

package/system-boot.js

@@ -0,0 +1,56 @@
+#!/usr/bin/env node
+
+const os = require('os');
+const fs = require('fs');
+const { exec } = require('child_process');
+
+const NGINX_LIMITS_CONFIG_FILE = '/etc/nginx/colyseus_limits.conf';
+const LIMITS_CONF_FILE = "/etc/security/limits.conf";
+
+// update file descriptor limits systemwide + nginx worker connections
+
+function bailOnErr(err) {
+  if (err) {
+    console.error(err);
+
+    // exit with error!
+    process.exit(1);
+  }
+}
+
+function updateNOFileConfig(cb) {
+  // const numCPU = os.cpus().length;
+  const totalmemMB = os.totalmem() / 1024 / 1024;
+  const estimatedCCUPerGB = 4000;
+
+  const maxCCU = Math.floor((totalmemMB / 1024) * estimatedCCUPerGB);
+  const systemMaxNOFileLimit = maxCCU * 4;
+  const nginxMaxNOFileLimit = maxCCU * 3; // 3x because of nginx -> proxy_pass -> node:port
+
+  // immediatelly apply new nofile limit
+  // (apparently this has no effect)
+  exec(`ulimit -n ${systemMaxNOFileLimit}`, bailOnErr);
+
+  // update "/etc/security/limits.conf" file.
+  fs.writeFileSync(LIMITS_CONF_FILE, `
+* - nofile ${systemMaxNOFileLimit}
+`, bailOnErr);
+
+  if (fs.existsSync(NGINX_LIMITS_CONFIG_FILE)) {
+    fs.writeFileSync(NGINX_LIMITS_CONFIG_FILE, `
+worker_rlimit_nofile ${nginxMaxNOFileLimit};
+
+events {
+    worker_connections ${maxCCU};
+    # multi_accept on;
+}
+`, cb);
+    console.log("new nofile limit:", { maxCCU, systemMaxNOFileLimit, nginxMaxNOFileLimit });
+
+  } else {
+    console.warn(NGINX_LIMITS_CONFIG_FILE, "not found.");
+  }
+}
+
+
+updateNOFileConfig(bailOnErr);