Merge pull request OpenUserJS#851 from Martii/tryMongoDBdifferentValues

Change some defaults with MongoDB and stderr

Auto-merge

Author: Martii

app.js

@@ -45,13 +45,32 @@ var settings = require('./models/settings.json');
 var connectStr = process.env.CONNECT_STRING || settings.connect;
 var sessionSecret = process.env.SESSION_SECRET || settings.secret;
 var db = mongoose.connection;
+
 var dbOptions = {
   server: {
+    poolSize: 5,
     socketOptions: {
-      keepAlive: 1
+      autoReconnect: false,
+      noDelay: true,
+      keepAlive: 1,
+      connectTimeoutMS: 0,
+      socketTimeoutMS: 0
     },
-    reconnectTries: 60,
-    reconnectInterval: 4000
+    reconnectTries: 30,
+    reconnectInterval: 1000
+  }
+};
+
+if (isPro) {
+  dbOptions.replset = {
+    secondaryAcceptableLatencyMS: 15,
+    poolSize: 5,
+    socketOptions: {
+      noDelay: true,
+      keepAlive: 0,
+      connectTimeoutMS: 0,
+      socketTimeoutMS: 0
+    }
   }
 };
 

controllers/scriptStorage.js

@@ -174,13 +174,16 @@ exports.getSource = function (aReq, aCallback) {
 
       if (!aScript) {
         aCallback(null);
-        console.warn('no script found' );
+        if (isDbg) {
+          console.warn('no script found yet' );
+        }
         return;
       }
 
       s3Object = s3.getObject({ Bucket: bucketName, Key: installNameBase + (isLib ? '.js' : '.user.js') }).createReadStream().
         on('error', function () {
-          if (isPro) {
+          // TODO: #486
+          if (isDbg) {
             console.error('S3 Key Not Found ' + installNameBase + (isLib ? '.js' : '.user.js'));
           }