Merge branch 'master' into meseta/master

lib/document_stores/amazon-s3.js

@@ -0,0 +1,56 @@
+/*global require,module,process*/
+
+var AWS = require('aws-sdk');
+var winston = require('winston');
+
+var AmazonS3DocumentStore = function(options) {
+  this.expire = options.expire;
+  this.bucket = options.bucket;
+  this.client = new AWS.S3({region: options.region});
+};
+
+AmazonS3DocumentStore.prototype.get = function(key, callback, skipExpire) {
+  var _this = this;
+
+  var req = {
+    Bucket: _this.bucket,
+    Key: key
+  };
+
+  _this.client.getObject(req, function(err, data) {
+    if(err) {
+      callback(false);
+    }
+    else {
+      callback(data.Body.toString('utf-8'));
+      if (_this.expire && !skipExpire) {
+        winston.warn('amazon s3 store cannot set expirations on keys');
+      }
+    }
+  });
+}
+
+AmazonS3DocumentStore.prototype.set = function(key, data, callback, skipExpire) {
+  var _this = this;
+
+  var req = {
+    Bucket: _this.bucket,
+    Key: key,
+    Body: data,
+    ContentType: 'text/plain'
+  };
+
+  _this.client.putObject(req, function(err, data) {
+    if (err) {
+      callback(false);
+    }
+    else {
+      callback(true);
+      if (_this.expire && !skipExpire) {
+        winston.warn('amazon s3 store cannot set expirations on keys');
+      }
+    }
+  });
+}
+
+module.exports = AmazonS3DocumentStore;

lib/document_stores/google-datastore.js

@@ -15,7 +15,7 @@ class GoogleDatastoreDocumentStore {
   // Save file in a key
   set(key, data, callback, skipExpire) {
     var expireTime = (skipExpire || this.expire === undefined) ? null : new Date(Date.now() + this.expire * 1000);
-    
+
     var taskKey = this.datastore.key([this.kind, key])
     var task = {
       key: taskKey,
@@ -31,9 +31,9 @@ class GoogleDatastoreDocumentStore {
         }
       ]
     };
-    
+
     this.datastore.insert(task).then(() => {
-      callback(true); 
+      callback(true);
     })
     .catch(err => {
       callback(false);
@@ -43,9 +43,8 @@ class GoogleDatastoreDocumentStore {
   // Get a file from a key
   get(key, callback, skipExpire) {
     var taskKey = this.datastore.key([this.kind, key])
-    
+
     this.datastore.get(taskKey).then((entity) => {
-      
       if (skipExpire || entity[0]["expiration"] == null) {
         callback(entity[0]["value"]);
       }
@@ -56,7 +55,6 @@ class GoogleDatastoreDocumentStore {
           callback(false);
         }
         else {
-        
           // update expiry
           var task = {
             key: taskKey,

lib/document_stores/redis.js

@@ -29,6 +29,11 @@ RedisDocumentStore.connect = function(options) {
   if (options.password) {
     RedisDocumentStore.client.auth(options.password);
   }
+
+  RedisDocumentStore.client.on('error', function(err) {
+    winston.error('redis disconnected', err);
+  });
+
   RedisDocumentStore.client.select(index, function(err) {
     if (err) {
       winston.error(