Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

config.example.js

@@ -3,6 +3,13 @@
     globals module
 */
 var domain = ' http://localhost:3000/';
+
+// You can `kill -USR2` the node process and it will write out a heap dump.
+// If your system doesn't support dumping, comment this out and install with
+// `npm install --production`
+// See: https://strongloop.github.io/strongloop.com/strongblog/how-to-heap-snapshots/
+require('heapdump');
+
 module.exports = {
 
     // the address you want to bind to, :: means all ipv4 and ipv6 addresses

package.json

@@ -12,6 +12,7 @@
   },
   "devDependencies": {
     "flow-bin": "^0.59.0",
+    "heapdump": "^0.3.9",
     "jshint": "~2.9.1",
     "less": "2.7.1",
     "lesshint": "^4.5.0",

storage/file.js

@@ -257,24 +257,23 @@ var getMessages = function (env, chanName, handler, cb) {
             return;
         }
         var errorState = false;
-        try {
-            readMessages(chan.path, function (msg) {
-                if (!msg || errorState) { return; }
-                //console.log(msg);
+        readMessages(chan.path, function (msg) {
+            if (!msg || errorState) { return; }
+            //console.log(msg);
+            try {
                 handler(msg);
-            }, function (err) {
-                if (err) {
-                    errorState = true;
-                    return void cb(err);
-                }
-                chan.atime = +new Date();
-                cb();
-            });
-        } catch (err2) {
-            console.error(err2);
-            cb(err2);
-            return;
-        }
+            } catch (e) {
+                errorState = true;
+                return void cb(err);
+            }
+        }, function (err) {
+            if (err) {
+                errorState = true;
+                return void cb(err);
+            }
+            chan.atime = +new Date();
+            cb();
+        });
     });
 };
 

www/common/sframe-chainpad-netflux-inner.js

@@ -40,7 +40,7 @@ define([
         var patchTransformer = config.patchTransformer;
         var validateContent = config.validateContent;
         var avgSyncMilliseconds = config.avgSyncMilliseconds;
-        var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 1;
+        var logLevel = typeof(config.logLevel) !== 'undefined'? config.logLevel : 2;
         var readOnly = config.readOnly || false;
         var sframeChan = config.sframeChan;
         var metadataMgr = config.metadataMgr;