Commit e2f042f

committed

Merge branch 'master' of github.com:mperham/memcache-client

2 parents 2f00ffc + 14b652d commit e2f042fCopy full SHA for e2f042f

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`MemCacheTimer = Timeout`
`23`	`23`	`end`
`24`	`24`	`rescue LoadError => e`
`25`		`- puts "[memcache-client] Could not load SystemTimer gem, falling back to Ruby's slower/unsafe timeout library: #{e.message}"`
`26`	`25`	`require 'timeout'`
`27`	`26`	`MemCacheTimer = Timeout`
`28`	`27`	`end`
`@@ -1015,8 +1014,10 @@ def initialize(memcache, host, port = DEFAULT_PORT, weight = DEFAULT_WEIGHT)`
`1015`	`1014`	`@status = 'NOT CONNECTED'`
`1016`	`1015`	`@timeout = memcache.timeout`
`1017`	`1016`	`@logger = memcache.logger`
`1018`		`-`
`1019`		`- self.extend(MemCache::EventedServer) if defined?(EM) and EM.reactor_running?`
	`1017`	`+`
	`1018`	`+ if defined?(EM) and EM.reactor_running? and defined?(MemCache::EventedServer)`
	`1019`	`+ self.extend(MemCache::EventedServer)`
	`1020`	`+ end`
`1020`	`1021`	`end`
`1021`	`1022`
`1022`	`1023`	`##`

Comments

(0)