merge master

Author: podviaznikov

README.md

@@ -44,14 +44,16 @@ Update - PATCH  - /resources/:id  *PATCH is a partial update, PUT is a full reso
 Delete - DELETE - /resources/:id
 
 #### Middleware Patterns
-Request Data validation and Middleware Flow Control - [tjmehta/dat-middleware](https://github.com/tjmehta/dat-middleware)
+
+Request Data validation and Middleware Flow Control -   [tjmehta/dat-middleware](https://github.com/tjmehta/dat-middleware)
 Middleware Flow Control - [tjmehta/middleware-flow](https://github.com/tjmehta/middleware-flow)
 Middlewares of models are autogenerated for you
-* Mongoose Models - /lib/middlewares/mongo/index.js - [tjmehta/mongooseware](https://github.com/tjmehta/mongooseware)
-* Class Models - /lib/middlewares/apis/index.js [tjmehta/middlewarize](https://github.com/tjmehta/middlewarize) *documentation soon
+* Mongoose Models - /lib/middlewares/mongo/index.js -   [tjmehta/mongooseware](https://github.com/tjmehta/mongooseware)
+* Class Models - /lib/middlewares/apis/index.js [tjmehta/middlewarize](https://github.com/tjmehta/middlewarize)
 Sharing the request object as a common context between middlewares allows us to make
 asynchronous code look synchronous and avoid "callback hell"
 
+
 #### Boom for Http Errors
 Nice Http Error library - [hapijs/boom](https://github.com/hapijs/boom)
 

docker-files/api_base/Dockerfile

@@ -1,17 +1,21 @@
 #
 # api_base Dockerfile
-# Author anandkumarpatel
-##
+#
 
 # Pull base image.
 FROM registry.runnable.com/runnable/base:latest
 
-WORKDIR /
+# Node.js @ 10.28
+# npm     @  2.1.8
+
+# install required packages
+#    lsof: required for open file monitoring
 
-# Installing Node.js
-RUN wget http://nodejs.org/dist/v0.10.29/node-v0.10.29.tar.gz
-RUN tar xvf node-v*.tar.gz
-WORKDIR node-v0.10.29/
-RUN ./configure
-RUN make -j16
-RUN make install
+RUN wget http://nodejs.org/dist/v0.10.28/node-v0.10.28.tar.gz \
+  && tar xvf node-v*.tar.gz \
+  && cd node-v0.10.28 \
+  && ./configure \
+  && make -j16 \
+  && make install \
+  && npm install -g npm@2.1.11 \
+  && apt-get install lsof

lib/express-app.js

@@ -10,19 +10,19 @@ var pkg = require('../package.json');
 var dogstatsd = require('models/datadog');
 var app = module.exports = express();
 
-app.use(require('connect-datadog')({
-  'dogstatsd': dogstatsd,
-  'response_code':true,
-  'method':true,
-  'tags': ['name:api', 'logType:express', 'env:'+process.env.NODE_ENV]
-}));
+if (envIs('production')) {
+  app.use(require('connect-datadog')({
+    'dogstatsd': dogstatsd,
+    'response_code':true,
+    'method':true,
+    'tags': ['name:api', 'logType:express', 'env:'+process.env.NODE_ENV]
+  }));
 
-if (envIs('development', 'local', 'io')) {
-  app.use(morganFreeman());
-  app.use(function (req, res, next) {
-    console.log(req.method, '-', req.url);
-    next();
-  });
+  // app.use(dogstatsd.captureSocketCount);
+}
+
+if (envIs('development', 'local', 'stage')) {
+  app.use(morganFreeman('short'));
 }
 
 app.use(require('./routes/github'));

lib/models/datadog/index.js

@@ -3,7 +3,7 @@ var StatsD = require('node-dogstatsd').StatsD;
 var client = module.exports = new StatsD(
   process.env.DATADOG_HOST,
   process.env.DATADOG_PORT);
-
+var exec = require('child_process').exec;
 
 function captureSteamData (streamName, stream) {
   stream.on('data', function(){
@@ -21,5 +21,26 @@ function captureSteamData (streamName, stream) {
 }
 
 
+function captureSocketCount (req, res, next) {
+  var sockets = require('http').globalAgent.sockets;
+  var request = require('http').globalAgent.requests;
+  var key;
+
+  for (key in sockets) {
+    client.gauge('api.sockets_open', sockets[key].length, 1, ['target:'+key]);
+  }
+
+  for (key in request) {
+    client.gauge('api.sockets_pending', request[key].length, 1, ['target:'+key]);
+  }
+
+  exec('lsof -p ' + process.pid + ' | wc -l', function (err, stdout) {
+    if (err) { return; }
+    client.gauge('api.openFiles', parseInt(stdout), 1, ['pid:'+process.pid]);
+  });
+
+  next();
+}
 
 module.exports.captureSteamData = captureSteamData;
+module.exports.captureSocketCount = captureSocketCount;

lib/routes/instances/index.js

@@ -23,7 +23,6 @@ var github = require('middlewares/apis').github;
 var docker = require('middlewares/apis').docker;
 var mavis = require('middlewares/apis').mavis;
 var sauron = require('middlewares/apis').sauron;
-var isInternal = require('middlewares/is-internal-request.js');
 var runnable = require('middlewares/apis').runnable;
 var hosts = require('middlewares/redis').hosts;
 var userStoppedContainer = require('middlewares/redis').userStoppedContainer;
@@ -562,11 +561,12 @@ app.post('/instances/:id/actions/copy',
 );
 
 /** Creates a container (instance.container) from the current instance build (instance.build)
- *  @event PUT rest/instances/:id/a
+ - *  @event PUT rest/instances/:id/a
+ + * THIS IS ALSO USED INTERNALLY
+ + *  @event POST rest/instances/:id/actions/redeploy
  *  @params id: instance id
  */
 app.post('/instances/:id/actions/redeploy',
-  isInternal,
   findInstance,
   flow.or(
     me.isOwnerOf('instance'),

package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "description": "Runnable API Server",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "repository": {
     "type": "git",
     "url": "http://github.com/CodeNow/api.git"
@@ -97,7 +97,11 @@
     "sauron": "git+ssh://git@github.com:codenow/sauron#v0.0.8",
     "server-destroy": "^1.0.0"
   },
-  "engine": "node >= 0.10.5",
+  "engineStrict": true,
+  "engine": {
+    "node": "0.10.28",
+    "npm": "2.1.8"
+  },
   "scripts": {
     "test-watch": "echo use 'bdd-watch' or 'unit-watch'",
     "_bdd": "npm run clear; NODE_PATH=./lib NODE_ENV=test lab -v -l -m 200 -e test",