remove hanami-router for rack 3.0 compatability

Author: oldmoe

bin/liteboard

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require 'optparse'
+require 'rackup'
 require_relative '../lib/litestack/liteboard/liteboard'
 DEFAULTS = {
   config_path: Litemetric::DEFAULT_OPTIONS[:config_path],
@@ -15,7 +16,7 @@ options = {
   Port: 9292,
   Host: 'localhost',
   environment: 'production',
-  pid: 'tmp/pids/liteboard.pid',
+  pid: './liteboard.pid',
   quiet: false
 }
 
@@ -79,4 +80,4 @@ options[:app] = Liteboard.app
 require_relative '../lib/litestack'
 puts "Starting Liteboard version #{Litestack::VERSION}"
 
-Rack::Server.start(options)
+Rackup::Server.start(options)

lib/litestack/liteboard/liteboard.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "hanami/router"
+require "rack"
 require "tilt"
 require "erubi"
 
@@ -11,37 +11,32 @@ class Liteboard
   @@resolutions = {"minute" => [300, 12], "hour" => [3600, 24], "day" => [3600 * 24, 7], "week" => [3600 * 24 * 7, 53], "year" => [3600 * 24 * 365, 100]}
   @@res_mapping = {"hour" => "minute", "day" => "hour", "week" => "day", "year" => "week"}
   @@templates = {}
-  @@app = Hanami::Router.new do
-    get "/", to: ->(env) do
+  @@app = proc do |env|
+    case path = env["PATH_INFO"]
+    when "/"
       Liteboard.new(env).call(:index)
-    end
-
-    get "/topics/Litejob", to: ->(env) do
+    when "/topics/Litejob"
       Liteboard.new(env).call(:litejob)
-    end
-
-    get "/topics/Litecache", to: ->(env) do
+    when "/topics/Litecache"
       Liteboard.new(env).call(:litecache)
-    end
-
-    get "/topics/Litedb", to: ->(env) do
+    when "/topics/Litedb"
       Liteboard.new(env).call(:litedb)
-    end
-
-    get "/topics/Litecable", to: ->(env) do
+    when "/topics/Litecable"
       Liteboard.new(env).call(:litecable)
     end
+
   end
 
   def initialize(env)
     @env = env
-    @params = @env["router.params"]
+    @req = Rack::Request.new(@env)
+    @params = @req.params 
     @running = true
     @lm = Litemetric.instance
   end
 
   def params(key)
-    URI.decode_uri_component(@params[key].to_s)
+    URI.decode_uri_component(@params[key.to_s].to_s)
   end
 
   def call(method)
@@ -227,9 +222,9 @@ def litejob
     @topic = "Litejob"
     @events = @lm.events_summaries(@topic, @resolution, @order, @dir, @search, @step * @count)
     @events.each do |event|
-      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event["name"])
+      data_points = @lm.event_data_points(@step, @count, @resolution, @topic, event[:name])
       event["counts"] = data_points.collect { |r| [r["rtime"], r["rcount"] || 0] }
-      event["values"] = data_points.collect { |r| [r["rtime"], r["rtotal"] || 0] }
+      event["values"] = data_points.collect { |r| [r["rtime"], (r["rtotal"] || 0.0)] }
     end
     @snapshot = read_snapshot(@topic)
     @size = begin
@@ -391,6 +386,7 @@ def round(float)
   end
 
   def format(float)
+    float = float.round(3)
     string = float.to_s
     whole, decimal = string.split(".")
     whole = whole.chars.reverse.each_slice(3).map(&:join).join(",").reverse

lib/litestack/litejobqueue.rb

@@ -141,15 +141,16 @@ def stop
 
   def exit_callback
     @running = false # stop all workers
-    return unless @jobs_in_flight > 0
-    puts "--- Litejob detected an exit, cleaning up"
-    index = 0
-    while @jobs_in_flight > 0 && index < 30 # 3 seconds grace period for jobs to finish
-      puts "--- Waiting for #{@jobs_in_flight} jobs to finish"
-      sleep 0.1
-      index += 1
+    if @jobs_in_flight > 0
+      puts "--- Litejob detected an exit, cleaning up"
+      index = 0
+      while @jobs_in_flight > 0 && index < 30 # 3 seconds grace period for jobs to finish
+        puts "--- Waiting for #{@jobs_in_flight} jobs to finish"
+        sleep 0.1
+        index += 1
+      end
+      puts " --- Exiting with #{@jobs_in_flight} jobs in flight"
     end
-    puts " --- Exiting with #{@jobs_in_flight} jobs in flight"
   end
 
   def setup

lib/litestack/litemetric.rb

@@ -148,10 +148,11 @@ def run_stmt_hash(stmt, *args)
   end
 
   def exit_callback
-    return unless @collector.count > 0
-    warn "--- Litemetric detected an exit, flushing metrics"
     @running = false
-    @collector.flush
+    if @collector.count > 0
+      warn "--- Litemetric detected an exit, flushing metrics"
+      @collector.flush
+    end
   end
 
   def setup
@@ -203,8 +204,8 @@ def collect_metrics
     def create_snapshotter
       Litescheduler.spawn do
         while @running
-          sleep @litemetric.options[:snapshot_interval]
           capture_snapshot
+          sleep @litemetric.options[:snapshot_interval]
         end
       end
     end

lib/litestack/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Litestack
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

litestack.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "sqlite3"
   spec.add_dependency "oj"
   spec.add_dependency "rack"
-  spec.add_dependency "hanami-router", "~> 2.0"
+  spec.add_dependency "rackup"
   spec.add_dependency "tilt"
   spec.add_dependency "erubi"