3 files changed, 16 insertions, 12 deletions
diff --git a/bucky/app/api.js b/bucky/app/api.js
index b4231e7..75cdbd7 100644
--- a/bucky/app/api.js
+++ b/bucky/app/api.js
@@ -163,8 +163,8 @@ function route (app){
     privacy.checkThreadPrivacy,
     multer.array("files"),
     bucky.verifyFilesOrComment,
-    bucky.createOptionalFiles,
     bucky.createOptionalComment,
+    bucky.createOptionalFiles,
     bucky.bumpThreadRevisions,
     function(req, res){
       res.json({
diff --git a/bucky/app/bucky.js b/bucky/app/bucky.js
index 3824c5e..8d9839f 100644
--- a/bucky/app/bucky.js
+++ b/bucky/app/bucky.js
@@ -413,6 +413,7 @@ var bucky = module.exports = {
       res.json({ error: "no comment" })
       return
     }
+    console.log("in create comment")
     var data = {
       thread: res.thread.get('id'),
       parent_id: req.body.parent_id || -1,
@@ -503,9 +504,15 @@ var bucky = module.exports = {
               privacy: false,
               storage: process.env.S3_BUCKET,
             }
+            req.body.comment = url+"\n"+file.originalname
             db.createFile(data).then(function(file){
               resolve(file)
-            }).catch( (err) => reject(err) )
+            }).catch( (err) => reject(err) ).then(
+            function(){
+              console.log("about to call createComment")
+              bucky.createComment(req, res, function(){})
+
+            })
           }
         })
       })
diff --git a/bucky/app/site.js b/bucky/app/site.js
index d38b094..0d35fd6 100644
--- a/bucky/app/site.js
+++ b/bucky/app/site.js
@@ -13,7 +13,10 @@ var favicon = require('serve-favicon')
 var passport = require('passport')
 var sessionstore = require('sessionstore')
 var session = require('express-session')
-var MongoStore = require('connect-mongo')(session);
+var redis = require('redis')
+var RedisStore = require('connect-redis')(session)
+var redisClient = redis.createClient()
+
 var upload = require('../util/upload')
 
 var app, server
@@ -45,16 +48,10 @@ site.init = function(){
     saveUninitialized: false,
   }
   if (!process.env.SESSIONS_IN_MEMORY) {
-    sessionSettings.store = new MongoStore({
-      url: 'mongodb://127.0.0.1:28108/buckySessionDb-'+ process.env.DB_NAME
-      // type: 'mongodb',
-      // host: 'localhost',
-      // port: 27017,
-      // dbName: 'buckySessionDb',
-      // collectionName: 'sessions',
-      // timeout: 10000,
-    })
+      sessionSettings.store =
+        new RedisStore({ client: redisClient })
   }
+
   app.use(session(sessionSettings))
   upload.init()
   federate.route(app)