cache_service 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6cf19e1b4ceb69447f52f2b66276f5fd0219408
-  data.tar.gz: e33d1b5d9cacc3efae856288bbee20bdb1a29fff
+  metadata.gz: a9e9ff2607b9833b46b489bb6ec8f47b8c9c5a8c
+  data.tar.gz: bc7a1ff3e9e9615d662c59b41a6ce3a25651cac9
 SHA512:
-  metadata.gz: 1b1eda1948c6d1280ab779b3416e85e066f113e1773c2008c61b42c6713bd3bf08aa9f8167b0564a2117b66b71da9d54c4c5112a25ca96f73fef76e84bf95b82
-  data.tar.gz: f83346f5846edf76e98bc2847b237bba6d1707228d7c2c18c7302d5d096c88ae280d4157dde06123b414e6265fd50e2ff8e39258e46cb886e8bd9243115e9293
+  metadata.gz: 33a3fb5754b15b39f678384b08abe1e3329f150d1a99c30fc4f4ede33c45ba468c5eca3928cbba3050964c914f8a21abf966fa7840d83c5e4ca28f083042ae93
+  data.tar.gz: 8a1ea1c183f6501d50c4235883a68f68c06a0fa0859230f1a4f948a3419e93cba7be0198108a641037c76eba88ec3048e12e5c430b4c82da19015f43b595a1cc

data/cache_service.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'cache_service'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.summary     = "A gem for cache facility"
   s.description = "A gem for cache facility"
   s.authors     = ['Linh Chau']

data/lib/cache_service.rb

@@ -9,14 +9,8 @@ rescue Exception => error
   # Who cares?
 end
 
-def proc_dir(dir)
-  Dir[ File.join(dir, '**', '*') ].reject { |p| File.directory? p }
-end
-
-
-proc_dir('.').reject { |p| !p.ends_with?('.rb') }.each do |rb_file|
-  unless (rb_file == './lib/cache_service.rb' || rb_file.starts_with?('./spec/'))
-    require rb_file
-    puts "require #{rb_file}"
-  end
+['caches', 'services'].each do |sub_path|
+  load_gem_lib(sub_path)
+  rb_files =  Dir.glob("#{File.expand_path('.')}/lib/#{sub_path}/*.rb")
+  rb_files.each { |rb_file| require rb_file }  
 end

data/lib/caches/mc_cache.rb

@@ -7,24 +7,40 @@ class McCache
     end
 
     def initialize
-      config = ConfigService.load_config('memcached.yml')[ConfigService.environment]
-      @@client ||= Dalli::Client.new(config['host'], config)
-    rescue => error
-      SdkLogger.logger.error("McCache.initialize error: #{error.message}")
+      @@config ||= ConfigService.load_config('memcached.yml')[ConfigService.environment]
+      @@client ||= Dalli::Client.new(@@config['host'], @@config)
+      cache_exists?
+    rescue Exception => error
+      puts("McCache.initialize error: #{error.message}")
       @@client = nil
     end #initialize
 
+    def cache_exists?
+    #   @@client.read('test')
+    # rescue Exception => error
+    #   @@client = nil
+      Net::HTTP.get(URI("http://#{@@config['host']}"))
+    rescue Errno::ECONNREFUSED => error
+      puts "**** Error: #{error.message}"
+      @@client = nil
+    rescue Net::HTTPBadResponse => error
+      # do nothing
+    end
+
     # Cache API, mimics ActiveSupport::Cache::Store
     # http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html
     def read(key, options = {})
+      return unless client
       client.get(key, options)
     end
 
     def write(key, value, options = {})
+      return unless client
       client.set(key, value, options[:expires_in], options)
     end
 
     def delete(key, options = {})
+      return unless client
       deleted = read(key)
       client.delete(key)
       deleted

data/lib/caches/zk_cache.rb

@@ -10,17 +10,31 @@ class ZkCache
     end
 
     def initialize
-      config = ConfigService.load_config('zookeeper.yml')[ConfigService.environment]
-      @@client ||= Zookeeper.new(config['host'])
-    rescue => error
-      SdkLogger.logger.error("ZkCache.initialize error: #{error.message}")
+      @@config ||= ConfigService.load_config('zookeeper.yml')[ConfigService.environment]
+      @@client ||= Zookeeper.new(@@config['host'])
+      cache_exists?
+    rescue Exception => error
+      puts("ZkCache.initialize error: #{error.message}")
       @@client = nil
     end #initialize
 
+    def cache_exists?
+    #   @@client.read('test')
+    # rescue Exception => error
+    #   @@client = nil
+      Net::HTTP.get(URI("http://#{@@config['host']}"))
+    rescue Errno::ECONNREFUSED => error
+      puts "**** Error: #{error.message}"
+      @@client = nil
+    rescue EOFError => error
+      # do nothing
+    end
 
     # Cache API, mimics ActiveSupport::Cache::Store
     # http://api.rubyonrails.org/classes/ActiveSupport/Cache/Store.html
     def read(key, options = {})
+      return unless client
+
       key = process_key(key)
       result = client.get(path: key)[:data]
       result = decode_data(result)
@@ -37,6 +51,8 @@ class ZkCache
     end
 
     def write(key, value, options = {})
+      return unless client
+
       key = process_key(key)
       init_key(key, nil)
       written_value = value
@@ -53,6 +69,8 @@ class ZkCache
     end
 
     def delete(key, options = {})
+      return unless client
+
       key = process_key(key)
       deleted = read(key)
       client.delete(path: key)

data/lib/services/cache_service.rb

@@ -17,22 +17,23 @@ class CacheService
       Dir.glob("#{File.expand_path('.')}/caches/*.rb").each { |rb_file| require rb_file }
       @@cache ||= eval(config['cache'])
       SdkLogger.logger = eval(config['logger']) if config['logger'].present?
-    rescue => error
+    rescue Exception => error
+      puts("Error #{error.message}")
       @@cache = nil
     end
 
     def read(key, options = {})
-      return nil unless @@cache.client
+      return nil unless cache
       cache.read(key, options)
     end
 
     def write(key, value, options = {})
-      return nil unless @@cache.client
+      return nil unless cache
       cache.write(key, value, options)
     end
 
     def delete(key, options = {})
-      return nil unless @@cache.client
+      return nil unless cache
       cache.delete(key, options)
     end
   end #class methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cache_service
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Linh Chau