Merge pull request inventid#75 from inventid/log_render_time

Log the render time
robinluog · Jul 5, 2016 · fbb4d89 · fbb4d89
2 parents fea3595 + 1cc2dc1
commit fbb4d89
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/create-release.sh b/create-release.sh
@@ -19,6 +19,7 @@ git pull > /dev/null
 echo "Whats the version number associated with this release? Type the version number followed by [enter]. "
 read VERSION
 
+npm version $VERSION
 git checkout master > /dev/null
 git pull > /dev/null
 git rebase develop > /dev/null

diff --git a/migrations/20160705120249.sql b/migrations/20160705120249.sql
@@ -0,0 +1 @@
+ALTER TABLE images ADD COLUMN rendered_at TIMESTAMPTZ default null;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iaas",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "ImageMagick as a HTTP service, using AWS S3 to store caches",
   "main": "src/index.js",
   "dependencies": {

diff --git a/src/dbCache.js b/src/dbCache.js
@@ -1,6 +1,6 @@
 import log from "./log";
 
-const insertImage = 'INSERT INTO images (id, x, y, fit, file_type, url, blur) VALUES ($1,$2,$3,$4,$5,$6,$7)';
+const insertImage = 'INSERT INTO images (id, x, y, fit, file_type, url, blur, rendered_at) VALUES ($1,$2,$3,$4,$5,$6,$7,$8)';
 const selectImage = 'SELECT url FROM images WHERE id=$1 AND x=$2 AND y=$3 AND fit=$4 AND file_type=$5 AND blur=$6';
 
 export default (db) => {
@@ -37,7 +37,8 @@ export default (db) => {
         params.fit,
         params.mime,
         url,
-        Boolean(params.blur)
+        Boolean(params.blur),
+        new Date()
       ];
 
       try {

diff --git a/src/index.js b/src/index.js
@@ -40,7 +40,7 @@ const uploadImage = async(req, res) => {
   const name = req.params.name;
   log('info', `Requested image upload for image_id ${name} with token ${sentToken}`);
 
-  const canConsumeToken = token(db).consume(sentToken, name);
+  const canConsumeToken = await token(db).consume(sentToken, name);
   if (!canConsumeToken) {
     res.status(403).end();
     return;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE images ADD COLUMN rendered_at TIMESTAMPTZ default null;