Merge branch 'master' of github.com:crafatar/crafatar

lib/cache.js

@@ -138,7 +138,7 @@ exp.save_hash = function(rid, userId, skin_hash, cape_hash, callback) {
 
 // removes the hash for +userId+ from the cache
 exp.remove_hash = function(rid, userId) {
-  logging.log(rid, "deleting hash from cache");
+  logging.debug(rid, "deleting hash from cache");
   redis.del(userId.toLowerCase(), "h", "t");
 };
 

lib/helpers.js

@@ -156,7 +156,7 @@ function resume(userId, type, err, hash) {
 function store_images(rid, userId, cache_details, type, callback) {
   var is_uuid = userId.length > 16;
   if (requests[type][userId]) {
-    logging.log(rid, "adding to request queue");
+    logging.debug(rid, "adding to request queue");
     push_request(userId, type, callback);
   } else {
     // add request to the queue

lib/response.js

@@ -77,11 +77,8 @@ module.exports = function(request, response, result) {
     return;
   }
 
-  if (result.status === -3) {
+  if (result.status === -2) {
-    response.writeHead(404, headers);
+    response.writeHead(result.code || 422, headers);
-    response.end(result.body);
-  } else if (result.status === -2) {
-    response.writeHead(422, headers);
     response.end(result.body);
   } else if (result.status === -1) {
     response.writeHead(500, headers);

lib/routes/avatars.js

@@ -52,8 +52,9 @@ module.exports = function(req, callback) {
   // check for extra paths
   if (req.url.path_list.length > 2) {
     callback({
-      status: -3,
+      status: -2,
-      body: "Invalid URL Path"
+      body: "Invalid Path",
+      code: 404
     });
     return;
   }

lib/routes/capes.js

@@ -11,8 +11,9 @@ module.exports = function(req, callback) {
   // check for extra paths
   if (req.url.path_list.length > 2) {
     callback({
-      status: -3,
+      status: -2,
-      body: "Invalid URL Path"
+      body: "Invalid Path",
+      code: 404
     });
     return;
   }

lib/routes/renders.js

@@ -62,8 +62,9 @@ module.exports = function(req, callback) {
   // check for extra paths
   if (req.url.path_list.length > 3) {
     callback({
-      status: -3,
+      status: -2,
-      body: "Invalid URL Path"
+      body: "Invalid Path",
+      code: 404
     });
     return;
   }

lib/routes/skins.js

@@ -59,8 +59,9 @@ module.exports = function(req, callback) {
   // check for extra paths
   if (req.url.path_list.length > 2) {
     callback({
-      status: -3,
+      status: -2,
-      body: "Invalid URL Path"
+      body: "Invalid Path",
+      code: 404
     });
     return;
   }

test/test.js

@@ -859,7 +859,7 @@ describe("Crafatar", function() {
           });
         });
 
-        it("should return a 404 (invalid request path " + location + ")", function(done) {
+        it("should return a 404 (invalid path " + location + ")", function(done) {
           request.get("http://localhost:3000/" + location + "/853c80ef3c3749fdaa49938b674adae6/invalid", function(error, res, body) {
             assert.ifError(error);
             assert.strictEqual(res.statusCode, 404);