waylon-core 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57bed2ca4c2e97caf912ff316be213e191605c61d2934a1a2cd590013a28cfa2
-  data.tar.gz: 6e32bf09330d75603b7340f18a58bc9a16d373097d91c2a082ff5fea8a4cb5b8
+  metadata.gz: 404fb7180c3c7b52c2bb3637fd3fb86d28cd5b4b1f1791e8b2fe0f94d7788ea9
+  data.tar.gz: 6b1da741b15a5092cddf65e81623a348454289ecb496eef1dfee081e79bb5f0e
 SHA512:
-  metadata.gz: 05bc6522ee2cda61c80dbabeb52a624d3301e6be562ebc575f4508e7537cfa212ba8f8b0f0d14ce4607852dd30162c93d5494325eac4bffe1c0e6f923492c31f
-  data.tar.gz: 8537c32ded411934c548b4aa47ca8a03dcf3ed502a927357f25932166f555d0224948776d1226865bea5b01d94deb300081ede84075a64a073eb535175059817
+  metadata.gz: f4852c99d93a726be2e21ec1a1cdf9fdf758508b09fed717ea1642b2f92c9c9adfe84e8fb922107f751859d2e3a331521d32f492911ffb6f5d82935a0ceef032
+  data.tar.gz: 03747526f39170835b3ab67ffc294a3e3c914968001b40e24eb5ddcd74fb2746c28ca7bb95288ab67523cf25018fe9709aa16956a54ab507839b1fe05a252771

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    waylon-core (0.1.6)
+    waylon-core (0.2.0)
       addressable (~> 2.8)
       faraday (~> 1.8)
       i18n (~> 1.8)
@@ -50,7 +50,7 @@ GEM
     moneta (1.5.1)
     mono_logger (1.1.1)
     multi_json (1.15.0)
-    multipart-post (2.2.0)
+    multipart-post (2.2.3)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nio4r (2.5.8)

data/lib/waylon/config.rb

@@ -32,11 +32,10 @@ module Waylon
 
     # Load in the config from env variables
     # @return [Boolean] Was the configuration loaded?
-    def load_env # rubocop:disable Metrics/AbcSize
+    def load_env
       @schema ||= {}
       self["global.log.level"] = ENV.fetch("LOG_LEVEL", "info")
-      self["global.redis.host"] = ENV.fetch("REDIS_HOST", "redis")
-      self["global.redis.port"] = ENV.fetch("REDIS_PORT", "6379")
+      self["global.redis"] = ENV.fetch("REDIS", "localhost:6379")
       self["global.admins"] = ENV.fetch("GLOBAL_ADMINS", "")
       ENV.keys.grep(/CONF_/).each do |env_key|
         conf_key = env_key.downcase.split("_")[1..].join(".")
@@ -49,13 +48,13 @@ module Waylon
     # Provides the redis host used for most of Waylon's brain
     # @return [String] The redis host
     def redis_host
-      self["global.redis.host"]
+      self["global.redis"].split(":").first
     end
 
     # Provides the redis port used for most of Waylon's brain
     # @return [String] The redis host
     def redis_port
-      self["global.redis.port"]
+      self["global.redis"].split(":").last
     end
 
     # Clear the configuration

data/lib/waylon/skills/diagnostics.rb

@@ -23,10 +23,10 @@ module Waylon
         response << "*Skill plugins:*"
         loaded_routes.each { |d| response << "  - #{d}" }
         response << "*Redis:*"
-        state, read_time, write_time = test_redis
+        state, raw_read_time, raw_write_time, read_time, write_time = test_redis
         response << "  - *Test Result:* #{state ? "Success" : "Error"}"
-        response << "  - *Read time:* #{read_time}s"
-        response << "  - *Write time:* #{write_time}s"
+        response << "  - *Read time:* #{read_time}s (raw: #{raw_read_time}s)"
+        response << "  - *Write time:* #{write_time}s (raw: #{raw_write_time}s)"
         if Resque.redis.connected?
           response << "*Queue Monitoring:*"
           response << "  - Failed jobs: #{Resque::Failure.count}"
@@ -43,17 +43,27 @@ module Waylon
         SenseRegistry.instance.senses.map { |_s, c| c.name }.sort.uniq
       end
 
-      def test_redis
-        test_key = ("a".."z").to_a.sample(10).join
+      def test_redis # rubocop:disable Metrics/AbcSize
+        test_key1 = ("a".."z").to_a.sample(10).join
+        test_key2 = ("a".."z").to_a.sample(10).join
         test_value = (0..1000).to_a.sample(20).map(&:to_s).join
         test_result = nil
 
-        write_time = Benchmark.realtime { db.store(test_key, test_value) }
-        read_time = Benchmark.realtime { test_result = db.load(test_key) }
+        raw_write_time = Benchmark.realtime { cache(test_key1) { test_value } }
+        raw_read_time = Benchmark.realtime { cache(test_key1) { test_value } }
+        enc_write_time = Benchmark.realtime { db.store(test_key2, test_value) }
+        enc_read_time = Benchmark.realtime { test_result = db.load(test_key2) }
 
-        db.delete(test_key)
+        db.delete(test_key1)
+        db.delete(test_key2)
 
-        [(test_value == test_result), read_time.round(6), write_time.round(6)]
+        [
+          (test_value == test_result),
+          raw_read_time.round(6),
+          raw_write_time.round(6),
+          enc_read_time.round(6),
+          enc_write_time.round(6)
+        ]
       end
     end
   end

data/lib/waylon/storage.rb

@@ -1,11 +1,16 @@
 # frozen_string_literal: true
 
+Waylon::Cache = Moneta.new(
+  :Redis,
+  url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+)
+
 module Waylon
   # Used for working with the Moneta store
   module Storage
     Store = Moneta.new(
       :Redis,
-      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/1"
+      url: "redis://#{ENV.fetch("REDIS", "localhost:6379")}/2"
     )
 
     def self.cipher
@@ -17,6 +22,10 @@ module Waylon
       Store.clear
     end
 
+    def self.delete(key)
+      Store.delete(key)
+    end
+
     def self.key?(name)
       Store.key?(name)
     end

data/lib/waylon/version.rb

@@ -5,8 +5,8 @@ module Waylon
     # The Waylon::Core version
     VERSION = [
       0, # Major
-      1, # Minor
-      6  # Patch
+      2, # Minor
+      0  # Patch
     ].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waylon-core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable