From 07a24f4290b72fbe8dad60041da2cc9d209cfe15 Mon Sep 17 00:00:00 2001 From: Jake Date: Sun, 2 Nov 2014 08:21:19 -0600 Subject: [PATCH 1/4] Rediscloud --- modules/cache.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cache.js b/modules/cache.js index 2e66ca7..5084118 100644 --- a/modules/cache.js +++ b/modules/cache.js @@ -5,9 +5,9 @@ var redis = null; function connect_redis() { console.log("connecting to redis"); if (process.env.REDISTOGO_URL) { - var rtg = require("url").parse(process.env.REDISTOGO_URL); - redis = require("redis").createClient(rtg.port, rtg.hostname); - redis.auth(rtg.auth.split(":")[1]); + var redisURL = require("url").parse(process.env.REDISCLOUD_URL); + redis = require("redis").createClient(redisURL.port, redisURL.hostname); + redis.auth(redisURL.auth.split(":")[1]); } else { redis = require("redis").createClient(); } From 57e234134e7e14b77f63aa7ac106ec87fdc7a7f0 Mon Sep 17 00:00:00 2001 From: Jake Date: Sun, 2 Nov 2014 08:22:45 -0600 Subject: [PATCH 2/4] Fix url --- modules/cache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cache.js b/modules/cache.js index 5084118..5154ef6 100644 --- a/modules/cache.js +++ b/modules/cache.js @@ -4,7 +4,7 @@ var redis = null; function connect_redis() { console.log("connecting to redis"); - if (process.env.REDISTOGO_URL) { + if (process.env.REDISCLOUD_URL) { var redisURL = require("url").parse(process.env.REDISCLOUD_URL); redis = require("redis").createClient(redisURL.port, redisURL.hostname); redis.auth(redisURL.auth.split(":")[1]); From a5f9ff462bb7398aabcdfd5f28ac788f65b5997b Mon Sep 17 00:00:00 2001 From: Jake Date: Sun, 2 Nov 2014 08:47:45 -0600 Subject: [PATCH 3/4] Add Procfile + __dirname --- Procfile | 1 + modules/helpers.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..e8f79ea --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: npm start \ No newline at end of file diff --git a/modules/helpers.js b/modules/helpers.js index 6c3ef21..3f0258a 100644 --- a/modules/helpers.js +++ b/modules/helpers.js @@ -31,8 +31,8 @@ function store_images(uuid, details, callback) { } else { // hash has changed console.log(uuid + "new hash: " + hash); - var facepath = config.faces_dir + hash + ".png"; - var helmpath = config.helms_dir + hash + ".png"; + var facepath = __dirname + '/../' + config.faces_dir + hash + ".png"; + var helmpath = __dirname + '/../' + config.helms_dir + hash + ".png"; // download skin, extract face/helm networking.skin_file(skinurl, facepath, helmpath, function(err) { if (err) { @@ -114,7 +114,7 @@ exp.get_avatar = function(uuid, helm, size, callback) { console.log("\nrequest: " + uuid); get_image_hash(uuid, function(err, status, hash) { if (hash) { - var filepath = (helm ? config.helms_dir : config.faces_dir) + hash + ".png"; + var filepath = __dirname + '/../' + (helm ? config.helms_dir : config.faces_dir) + hash + ".png"; skins.resize_img(filepath, size, function(img_err, result) { if (img_err) { callback(img_err, -1, null); From 8c6df51965b6e3afaadd46f083177efb1e31991b Mon Sep 17 00:00:00 2001 From: Jake Date: Sun, 2 Nov 2014 08:54:31 -0600 Subject: [PATCH 4/4] Try adding folders..? --- .gitignore | 2 +- skins/faces/.gitkeep | 0 skins/helms/.gitkeep | 0 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 skins/faces/.gitkeep create mode 100644 skins/helms/.gitkeep diff --git a/.gitignore b/.gitignore index 93f3af4..1750f60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -skins/ +skins/*.png *.log node_modules/ .DS_Store diff --git a/skins/faces/.gitkeep b/skins/faces/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/skins/helms/.gitkeep b/skins/helms/.gitkeep new file mode 100644 index 0000000..e69de29