Redis cache (tdiary-cache-redis) support

Author: minimum2scp

CHANGELOG.md

@@ -1,4 +1,8 @@
-## 0.1.1 (2015-09-04)
+## 0.1.2 (2015-09-xx)
+
+ * Redis cache support (tdiary-cache-redis)
+
+## 0.1.1 (2015-09-10)
 
  * Update magellan-proxy to 0.0.2.pre
  * Create database if not exist

README.md

@@ -28,17 +28,29 @@ MySQL database connection is configured by environment variables:
  * `MYSQL_USERNAME`
  * `MYSQL_PASSWORD`
 
+### Cache with redis
+
+magellan-tdiary stores cache into Redis, using tdiary-cache-redis gem.
+Redis connection is configured by environment variables:
+
+ * `REDIS_HOST`
+ * `REDIS_PORT` (optional)
+ * `REDIS_DATABASE` (optional)
+ * `REDIS_PASSWORD` (optional)
+
 ## Local test with docker-compose
 
 You can try tDiary with docker-compose:
 
 ```
 % docker-compose up -d
-Creating magellantdiary_db_1...
-Creating magellantdiary_tdiary_1...
+magellantdiary_db_1 is up-to-date
+magellantdiary_cache_1 is up-to-date
+Starting magellantdiary_tdiary_1...
 % docker-compose ps
          Name                        Command               State    Ports
 ---------------------------------------------------------------------------
+magellantdiary_cache_1    /entrypoint.sh redis-server      Up      6379/tcp
 magellantdiary_db_1       /entrypoint.sh mysqld            Up      3306/tcp
 magellantdiary_tdiary_1   /opt/magellan-tdiary/entry ...   Up
 ```

build/Gemfile.local

@@ -4,7 +4,7 @@ gem "mysql2"
 gem "tdiary",                  path: "."
 gem "tdiary-contrib",          github: "tdiary/tdiary-contrib"
 #gem "tdiary-cache-memcached",  github: "tdiary/tdiary-cache-memcached"
-#gem "tdiary-cache-redis",      github: "tdiary/tdiary-cache-redis"
+gem "tdiary-cache-redis",      github: "tdiary/tdiary-cache-redis"
 #gem "tdiary-io-mongodb",       github: "tdiary/tdiary-io-mongodb"
 gem "tdiary-io-rdb",           github: "tdiary/tdiary-io-rdb"
 #gem "tdiary-style-emptdiary",  github: "tdiary/tdiary-style-emptdiary"

build/entrypoint

@@ -22,5 +22,21 @@ if ENV['DATABASE_URL']
   system('rake -f /opt/magellan-tdiary/Rakefile db:create')
 end
 
+if !ENV['REDIS_HOST'] && ENV['CACHE_PORT_6379_TCP_ADDR']
+  ENV['REDIS_HOST'] = ENV['CACHE_PORT_6379_TCP_ADDR']
+end
+
+if !ENV['REDIS_PORT'] && ENV['CACHE_PORT_6379_TCP_PORT']
+  ENV['REDIS_PORT'] = ENV['CACHE_PORT_6379_TCP_PORT']
+end
+
+if !ENV['REDIS_URL'] && ENV['REDIS_HOST']
+  require 'uri'
+  ENV['REDIS_URL'] = URI::Generic.build(scheme: "redis", host: ENV['REDIS_HOST'], port: (ENV['REDIS_PORT'] || 6379).to_i).tap{|o|
+    o.user = ":#{ENV['REDIS_PASSWORD']}" if ENV['REDIS_PASSWORD']
+    o.path = "/#{ENV['REDIS_DATABASE']}" if ENV['REDIS_DATABASE']
+  }.to_s
+end
+
 program = ARGV.shift
 exec(program, *ARGV)

docker-compose.yml

@@ -1,7 +1,8 @@
 tdiary:
-  image: minimum2scp/magellan-tdiary:0.1.1
+  image: minimum2scp/magellan-tdiary:0.1.2
   links:
     - db
+    - cache
   command: bundle exec puma --port 80
   environment:
     - MYSQL_USERNAME=tdiary
@@ -21,4 +22,6 @@ db:
     #- ./volumes/mysql-data:/var/lib/mysql:rw
     - ./volumes/mysql-conf/charset.cnf:/etc/mysql/conf.d/charset.cnf:ro
 
+cache:
+  image: redis:3.0