@@ -118,7 +118,7 @@ class MemCache # Other options are ignored. def initialize(*args) - servers = [] + servers = (ENV["MEMCACHE_SERVERS"] || "").split(",") opts = {} case args.length @@ -138,7 +138,7 @@ class MemCache end opts = DEFAULT_OPTIONS.merge opts - @namespace = opts[:namespace] + @namespace = ENV["MEMCACHE_NAMESPACE"] || opts[:namespace] @readonly = opts[:readonly] @multithread = opts[:multithread] @timeout = opts[:timeout] lib/memcache.rb @@ -114,6 +114,8 @@ class TestMemCache < Test::Unit::TestCase def setup @cache = MemCache.new 'localhost:1', :namespace => 'my_namespace' + ENV["MEMCACHE_SERVERS"] = nil + ENV["MEMCACHE_NAMESPACE"] = nil end def test_performance @@ -362,6 +364,37 @@ class TestMemCache < Test::Unit::TestCase assert passed end + def test_initialize_from_ENV + ENV["MEMCACHE_SERVERS"] = "localhost:1234" + + cache = MemCache.new + + assert_equal nil, cache.namespace + assert_equal false, cache.readonly? + assert_equal 1, cache.servers.size + end + + def test_initialize_multi_from_ENV + ENV["MEMCACHE_SERVERS"] = "localhost:1234,localhost:5467" + + cache = MemCache.new + + assert_equal nil, cache.namespace + assert_equal false, cache.readonly? + assert_equal 2, cache.servers.size + end + + def test_initialize_from_ENV_with_namespace + ENV["MEMCACHE_SERVERS"] = "localhost:1234" + ENV["MEMCACHE_NAMESPACE"] = "foobar" + + cache = MemCache.new + + assert_equal "foobar", cache.namespace + assert_equal false, cache.readonly? + assert_equal 1, cache.servers.size + end + def test_initialize cache = MemCache.new :namespace => 'my_namespace', :readonly => true test/test_mem_cache.rb test/test_benchmark.rb d5ae15d362c379c3a6692e2d5b9beae545392cba Blake Mizerany blake.mizerany@gmail.com http://github.com/bmizerany/memcache-client/commit/c41101539773622294840122f30f85b2a5af3bc6 c41101539773622294840122f30f85b2a5af3bc6 2009-04-30T15:28:41-07:00 2009-04-30T15:28:41-07:00 Default to using MEMCACHE_SERVERS and MEMCACHE_NAMESPACE MEMCACHE_SERVERS is a comma seperated list of servers: export MEMCACHE_SERVERS=localhost:1234,localhost:5678 export MEMCACHE_NAMESPACE=foobar 7be4714f0bea9d36eb6182d7d45e443ec7efa30c Blake Mizerany blake.mizerany@gmail.com