azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-03-22 07:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up redis env parsing, support REDISCLOUD_URL, REDIS_URL or fall back to default

Browse Source
This commit is contained in:
jomo 2015-01-09 19:52:51 +01:00
parent bc2bb0bec0
commit a05e82cb5e
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/cache.js
View File

@ -1,18 +1,24 @@
var logging = require("./logging"); var logging = require("./logging");
var node_redis = require("redis");
var config = require("./config"); var config = require("./config");
var redis = null; var url = require("url");
var fs = require("fs"); var fs = require("fs");
var redis = null;
// sets up redis connection // sets up redis connection
// flushes redis when running on heroku (files aren't kept between pushes) // flushes redis when running on heroku (files aren't kept between pushes)
function connect_redis() { function connect_redis() {
logging.log("connecting to redis..."); logging.log("connecting to redis...");
if (process.env.REDISCLOUD_URL) { // parse redis env
var redisURL = require("url").parse(process.env.REDISCLOUD_URL); var redis_env = (process.env.REDISCLOUD_URL || process.env.REDIS_URL);
redis = require("redis").createClient(redisURL.port, redisURL.hostname); var redis_url = redis_env ? url.parse(redis_env) : {};
redis.auth(redisURL.auth.split(":")[1]); redis_url.port = redis_url.port || 6379;
} else { redis_url.hostname = redis_url.hostname || "localhost";
redis = require("redis").createClient(); // connect to redis
redis = node_redis.createClient(redis_url.port, redis_url.hostname);
if (redis_url.auth) {
redis.auth(redis_url.auth.split(":")[1]);
} }
redis.on("ready", function() { redis.on("ready", function() {
logging.log("Redis connection established."); logging.log("Redis connection established.");

2
server.js
View File

@ -45,7 +45,7 @@ function requestHandler(req, res) {
request.url.path_list = path_list; request.url.path_list = path_list;
var local_path = request.url.path_list[1]; var local_path = request.url.path_list[1];
console.log(request.method + " " + request.url.href); logging.log(request.method + " " + request.url.href);
if (request.method == "GET" || request.method == "HEAD") { if (request.method == "GET" || request.method == "HEAD") {
try { try {
switch (local_path) { switch (local_path) {