marty 1.0.43 → 1.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66276891458efd498648be59d402697d007be05
-  data.tar.gz: 6fd5ee9414488b17042c87bb1439ca1021d371b6
+  metadata.gz: 817a8f32d8a912597e8941cb60889a6f9e3723bc
+  data.tar.gz: cccaf421c0216156db7c106b69577f0e363c4c58
 SHA512:
-  metadata.gz: acff2e6a1842b34ed8ec5c17e8d15bd314723eae74cc11e043ca8f4f23bee95da6c0a46a56dca72bec7e248878f2849b517fb8f8397f3f1873ffd3658bd6c0d5
-  data.tar.gz: b596a59fd785a72531318a652dc9f20c71944df9a433e5b8db183316d4434015c974cc0276940ca7c3d418f94e49fbd07d6fbc228447c2fd63172f03bab0ff4c
+  metadata.gz: 030c85527c4809aeb5a18634425c5dc5924534b7f8b3f44fc83189adccfc7724b87b97e06cdeac5c5004b1301c4f9745918bcb47c8004ac0b07492d6e2fcc2b3
+  data.tar.gz: dcbabb68d76e981e927eda2e9c8e9b3a31a4896ef66561f7bcaa1d553fc31f4b8e5d056b084b7199982e242f67938964ec59366b645588c7e266a97d9ea724aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (1.0.43)
+    marty (1.0.44)
       axlsx (= 2.1.0pre)
       coderay
       delorean_lang (~> 0.1)

data/app/components/marty/log_view.rb

@@ -11,7 +11,7 @@ class Marty::LogView < Marty::Grid
     c.paging     = :buffered
     c.editing    = :in_form
     c.attributes = [
-      :timestamp,
+      :timestamp_custom,
       :message_type,
       :message,
       :details
@@ -26,7 +26,7 @@ class Marty::LogView < Marty::Grid
 
   def default_form_items
     [
-      :timestamp,
+      :timestamp_custom,
       :message_type,
       :message,
       textarea_field(:details).merge!({height: 400})
@@ -50,26 +50,38 @@ class Marty::LogView < Marty::Grid
     c.read_only    = true
   end
 
-  attribute :timestamp do |c|
+  # FIXME?: timestamp_custom is needed to display datetime data proprely
+  # UI does not interact well with AR/PG and doesn't display fractional s
+  # This work around requires explicit sorting/filtering
+  attribute :timestamp_custom do |c|
     c.text         = I18n.t("log_grid.timestamp")
     c.width        = 200
     c.read_only    = true
+    c.filterable = true
     c.xtype        = :datecolumn
     c.format       = 'Y-m-d h:i:s.u'
     c.field_config = {
       xtype: :displayfield,
     }
     c.getter = lambda { |r| Time.at(r.timestamp) }
+    c.sorting_scope = lambda {|r, dir| r.order("timestamp " + dir.to_s)}
+
+    # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast
+    # to text in order to compare filter input using the LIKE operator.
+    # Otherwise it will fail. '<' and '>' functionality is missing.
+    c.filter_with = lambda {|r, v, op|
+      r.where("timestamp::text  #{op} '#{v}%'")}
   end
 
   column :details do |c|
-    c.getter = lambda { |r| CGI.escapeHTML(r.details) }
+    c.getter = lambda { |r| CGI.escapeHTML(r.details.pretty_inspect) }
   end
 
   attribute :details do |c|
     c.text      = I18n.t("log_grid.details")
     c.width     = 900
     c.read_only = true
+    c.getter    = lambda { |r| r.details.to_s}
   end
 end
 

data/app/models/marty/log.rb

@@ -1,69 +1,22 @@
 class Marty::Log < Marty::Base
-
-  def self.logfile
-    @logfile ||= Rails.root.join('log', Rails.env + '.sql').to_s
-  end
-
-  establish_connection({
-                         adapter:  "sqlite3",
-                         database: logfile
-                       })
-  self.table_name = "log"
-  self.primary_key = "id"
-
-  def self.db_init
-    db = SQLite3::Database.new(Marty::Log.logfile)
-    db.execute <<-SQL
-      CREATE TABLE IF NOT EXISTS log (
-      id INTEGER PRIMARY KEY,
-      message_type TEXT,
-      message TEXT,
-      timestamp REAL,
-      details BLOB )
-      SQL
-    db
-  end
+  # establish_connection creates a connection using the connection pool
+  # based on the current AR connection (i.e. duplicates AR connection)
+  establish_connection
 
   def self.write_log(type, message, details)
     begin
-      @db ||= db_init
-      stmt = @db.prepare <<-SQL
-          INSERT INTO log (message_type, message, timestamp, details)
-            values (?, ?, ?, ?)
-          SQL
-      stmt.bind_param(1, type.to_s)
-      stmt.bind_param(2, message)
-      stmt.bind_param(3, Time.zone.now.to_f)
-      stmt.bind_param(4, details.pretty_inspect)
-
-      sent = false
-      retries = 3
-      delay = 0.1
-      until sent
-        begin
-          stmt.execute
-          sent = true
-        rescue SQLite3::BusyException
-          raise if retries == 0
-          retries -= 1
-          sleep delay
-        end
-      end
-
+      create!(message_type: type,
+             message: message,
+             details: details,
+             timestamp: Time.zone.now)
     rescue => e
       Marty::Util.logger.error("Marty::Logger failure: #{e.message}")
-    ensure
-      stmt.close if stmt rescue nil
     end
   end
 
   def self.cleanup(days_to_keep)
     raise "Must give numeric value. (Got '#{days_to_keep}')" unless
       (Float(days_to_keep) rescue false)
-    @db ||= db_init
-    cutoff = Time.zone.now.to_i - days_to_keep.to_i*60*60*24
-    @db.execute <<-SQL
-       delete from log where timestamp <= #{cutoff}
-    SQL
+    where("timestamp <= ?", Time.zone.now - days_to_keep.to_i.days).delete_all
   end
 end

data/db/migrate/303_create_marty_logs.rb

@@ -0,0 +1,10 @@
+class CreateMartyLogs < ActiveRecord::Migration
+  def change
+    create_table :marty_logs do |t|
+      t.string :message_type, null: false
+      t.string :message, null: false
+      t.jsonb :details, null: true
+      t.datetime :timestamp, null: false
+    end
+  end
+end

data/lib/marty/logger.rb

@@ -1,5 +1,3 @@
-require 'sqlite3'
-
 class Marty::Logger
 
   def self.method_missing(m, *args, &block)
@@ -17,10 +15,9 @@ class Marty::Logger
     begin
       yield
     rescue => e
-      error(error_message, { message: e.message,
-                             data: error_data })
+      error(error_message, { "message" => e.message,
+                             "data" => error_data})
       raise "#{error_message}: #{e.message}"
     end
   end
-
 end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.43"
+  VERSION = "1.0.44"
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -353,6 +353,10 @@ describe Marty::RpcController do
     @data_json = [@data].to_json
   }
 
+  after(:each) do
+    Marty::Log.delete_all
+  end
+
   let(:t1) { @t1 }
   let(:t2) { @t2 }
   let(:p0) { @p0 }
@@ -716,15 +720,6 @@ describe Marty::RpcController do
   end
 
   context "output_validation" do
-    before(:all) do
-      @db =  SQLite3::Database.new(Marty::Log.logfile)
-    end
-    before(:each) do
-      @logid = @db.execute('select max(id) from log').first.first || 0 rescue 0
-    end
-    after(:all) do
-      @db.close
-    end
     it "validates output" do
       Marty::ApiConfig.create!(script: "M4",
                                node: "A",
@@ -744,7 +739,7 @@ describe Marty::RpcController do
       res_hash = JSON.parse(response.body)
       expect(res_hash).to eq([135,291,[{"a"=>132,"b"=>456},
                                        {"a"=>789,"b"=>132}]])
-      logs = Marty::Log.where("id > #{@logid}").to_a
+      logs = Marty::Log.all
       expect(logs.count).to eq(0)
     end
 
@@ -781,20 +776,19 @@ describe Marty::RpcController do
       expect(res_hash[0]["error"]).to include(expect1)
       expect(res_hash[0]["error"]).to include(expect2)
 
-      logs = Marty::Log.where("id > #{@logid}").to_a
+      logs = Marty::Log.all
       expect(logs.count).to eq(2)
       expect(logs[0].message).to eq("API M5:A.result")
       expect(logs[1].message).to eq("API M5:A.result2")
       logs.each do |ml|
-        expect(ml.details).to include(expect1)
-        expect(ml.details).to include(expect2)
-        expect(ml.details).to include(
-         ":data=>[{\"a\"=>\"str\", \"b\"=>456}, {\"a\"=>789, \"b\"=>\"str\"}]}")
+        expect(ml.details["error"].join).to include(expect1)
+        expect(ml.details["error"].join).to include(expect2)
+        expect(ml.details["data"]).to eq([{"a"=>"str", "b"=>456},
+                                          {"a"=>789, "b"=>"str"}])
       end
     end
 
     it "validates output (missing item)" do
-      logid = @db.execute('select max(id) from log').first.first rescue 0
       Marty::ApiConfig.create!(script: "M9",
                                node: "A",
                                attr: nil,
@@ -818,13 +812,13 @@ describe Marty::RpcController do
       expect(res_hash[0]["error"]).to include(expect1)
       expect(res_hash[0]["error"]).to include(expect2)
 
-      logs = Marty::Log.where("id > #{@logid}").to_a
+      logs = Marty::Log.all
       expect(logs.count).to eq(1)
       expect(logs[0].message).to eq("API M9:A.result")
-      expect(logs[0].details).to include(expect1)
-      expect(logs[0].details).to include(expect2)
-      expect(logs[0].details).to include(
-         ":data=>[{\"a\"=>1, \"b\"=>123}, {\"a\"=>789, \"b\"=>123}]")
+      expect(logs[0].details["error"].join).to include(expect1)
+      expect(logs[0].details["error"].join).to include(expect2)
+      expect(logs[0].details["data"]).to eq([{"a"=>1, "b"=>123},
+                                             {"a"=>789, "b"=>123}])
     end
   end
 

data/spec/features/log_view_spec.rb

@@ -2,23 +2,9 @@ require 'spec_helper'
 
 feature 'logger view', js: true, capybara: true do
 
-  def manual_insert(type, message, ts, detail)
-    stmt = @db.prepare <<-SQL
-       INSERT INTO log (message_type, message, timestamp, details)
-       VALUES (?, ?, ?, ?)
-    SQL
-    stmt.bind_param(1, type)
-    stmt.bind_param(2, message)
-    stmt.bind_param(3, ts)
-    stmt.bind_param(4, detail)
-    stmt.execute
-    stmt.close
-  end
-
   before(:all) do
     self.use_transactional_fixtures = false
-    @db =  SQLite3::Database.new(Marty::Log.logfile)
-    @db.execute("delete from log")
+    Marty::Log.delete_all
 
     info_s = { info: 'message' }
     error_s = [1, 2, 3, { error: 'message' }]
@@ -26,13 +12,20 @@ feature 'logger view', js: true, capybara: true do
     Marty::Logger.info('info message', nil)
     Marty::Logger.error('error message', error_s)
     Marty::Logger.fatal('fatal message', fatal_s)
-    manual_insert("debug", "hi mom", (Time.zone.now - 5.days).to_i,
-                  ["one", "two", 3, 4.0].pretty_inspect)
-    manual_insert("warn", "all your base", (Time.zone.now - 10.days).to_i,
-                  [5].pretty_inspect)
-    @ts = (@db.execute "select timestamp from log order by timestamp desc").map do
+
+    Marty::Log.create!(message_type: "debug",
+                       message: "hi mom",
+                       details: ["one", "two", 3, 4.0],
+                       timestamp: Time.zone.now - 5.days)
+
+    Marty::Log.create!(message_type: "warn",
+                       message: "all your base",
+                       details: [5],
+                       timestamp: Time.zone.now - 10.days)
+
+    @ts = Marty::Log.select(:timestamp).order(timestamp: :desc).map do
       |(ts)|
-      Time.zone.at(ts).strftime('%Y-%m-%dT%H:%M:%S.%L%:z')
+      Time.zone.at(ts[:timestamp]).strftime('%Y-%m-%dT%H:%M:%S.%L%:z')
     end
 
     @clean_file = "/tmp/clean_#{Process.pid}.psql"
@@ -42,8 +35,7 @@ feature 'logger view', js: true, capybara: true do
 
   after(:all) do
     restore_clean_db(@clean_file)
-    @db.execute "delete from log"
-    @db.close
+    Marty::Log.delete_all
     self.use_transactional_fixtures = true
   end
 
@@ -54,16 +46,18 @@ feature 'logger view', js: true, capybara: true do
     show_submenu('Log Maintenance')
     press('View Log')
     wait_for_ready
+
     exp_types = ["fatal", "error", "info", "debug", "warn"]
     exp_messages = ["fatal message", "error message",
                     "info message", "hi mom", "all your base"]
-    exp_details = [ "[\"string\", 123, {:fatal=>\"message\", "\
-                     ":another_key=>\"value\"}]\n",
-                    "[1, 2, 3, {:error=>\"message\"}]\n",
+    exp_details = [ "[\"string\", 123, {\"fatal\"=>\"message\", "\
+                     "\"another_key\"=>\"value\"}]\n",
+                    "[1, 2, 3, {\"error\"=>\"message\"}]\n",
                     "nil\n",
                     "[\"one\", \"two\", 3, 4.0]\n",
-                    "[5]\n"]
-    [[nil, 5], [7, 4], [3, 3], [0, 0]].each do |days, exp_count|
+                    "[5]\n"
+                  ]
+   [[nil, 5], [7, 4], [3, 3], [0, 0]].each do |days, exp_count|
       if days
         press('System')
         show_submenu('Log Maintenance')
@@ -75,13 +69,14 @@ feature 'logger view', js: true, capybara: true do
         find(:refresh).click
         wait_for_ready
       end
+
       cnt = logview.row_count()
       expect(cnt).to eq(exp_count)
       types = logview.col_values('message_type', cnt, 0)
       messages = logview.col_values('message', cnt, 0)
       details = logview.col_values('details', cnt, 0).
-                map { |d| CGI.unescapeHTML(d) }
-      ts = logview.col_values('timestamp', cnt, 0)
+                  map { |d| CGI.unescapeHTML(d) }
+      ts = logview.col_values('timestamp_custom', cnt, 0)
       expect(ts).to eq(@ts.slice(0,exp_count))
       expect(types).to eq(exp_types.slice(0,exp_count))
       expect(messages).to eq(exp_messages.slice(0,exp_count))

data/spec/lib/logger_spec.rb

@@ -7,48 +7,36 @@ module Marty
       self.use_transactional_fixtures = false
     end
     before(:each) do
-      @db =  SQLite3::Database.new(Marty::Log.logfile)
-      @db.execute "delete from log"
-    end
-    after(:each) do
-      @db.close
+      Marty::Log.delete_all
     end
     after(:all) do
       self.use_transactional_fixtures = true
     end
 
+    it "log has its own connection" do
+      expect(Marty::Log.connection).not_to equal(Marty::Posting.connection)
+      expect(Marty::Posting.connection).to equal(Marty::Script.connection)
+    end
+
     it "logs" do
-      File.open(Rails.root.join("log/test.log")) do |f|
-        f.seek(0, IO::SEEK_END)
-        info_s = { info: 'message' }
-        error_s = [1, 2, 3, { error: 'message' }]
-        fatal_s = ["string", 123, { fatal: "message", another_key: 'value' }]
-        Marty::Logger.info('info message', info_s)
-        Marty::Logger.error('error message', error_s)
-        Marty::Logger.fatal('fatal message', fatal_s)
-        rails_log = f.readlines
-        log = @db.execute "select * from log"
-        log_detail = []
-        log_ts = []
-        log.each do |l|
-          id, type, msg, ts, detail_str = l
-          log_detail[id] = [type, msg, detail_str]
-          log_ts[id] = ts
-        end
-        expect(rails_log).to eq(["info message\n",
-                                 "error message\n",
-                                 "fatal message\n"])
-        expect(log_detail[1]).to eq(["info", "info message",
-                                     info_s.pretty_inspect])
-        expect(log_detail[2]).to eq(["error", "error message",
-                                     error_s.pretty_inspect])
-        expect(log_detail[3]).to eq(["fatal", "fatal message",
-                                     fatal_s.pretty_inspect])
-        (1..3).each do |idx|
-          expect(log_ts[idx]).to be_within(5).of(Time.zone.now.to_i)
-        end
+      info_s = {'info' => 'message'}
+      error_s = [1, 2, 3, {'error' =>'message'}]
+      fatal_s = ["string", 123, {'fatal' => "message",
+                                 'another_key' => 'value'}]
+      Marty::Logger.info('info message', info_s)
+      Marty::Logger.error('error message', error_s)
+      Marty::Logger.fatal('fatal message', fatal_s)
+      log = Marty::Log.all
+      log_detail = log.map{|l| [l[:message_type], l[:message], l[:details]]}
+      log_ts = log.map{|l| l[:timestamp]}
+      expect(log_detail[0]).to eq(["info", "info message", info_s])
+      expect(log_detail[1]).to eq(["error", "error message", error_s])
+      expect(log_detail[2]).to eq(["fatal", "fatal message", fatal_s])
+      log_ts.each do |ts|
+        expect(ts.to_i).to be_within(5).of(Time.zone.now.to_i)
       end
     end
+
     it "with_logging" do
       bd = 'block description'
       the_error = 'error during my block'
@@ -64,40 +52,11 @@ module Marty
       log = Marty::Log.first
       expect(log.message_type).to eq('error')
       expect(log.message).to eq(bd)
-      expect(log.details).to eq({ message: the_error,
-                                  data: data }.pretty_inspect)
-    end
-  end
-  describe "Logger errors" do
-    it "fails gracefully" do
-      allow(Marty::Log).to receive(:db_init).
-                            and_raise("Error initializing DB")
-      Marty::Log.instance_variable_set(:@db, nil)
-      File.open(Rails.root.join("log/test.log")) do |f|
-        f.seek(0, IO::SEEK_END)
-        expect{Marty::Logger.info('info message', [1,2,3])}.not_to raise_error
-        rails_log = f.readlines
-        expect(rails_log).to eq(["info message\n",
-                                 "Marty::Logger failure: Error initializing DB\n"])
-      end
-    end
-    it "fails gracefully in ensure" do
-      Marty::Logger.info('init db', [])
-      close_err = 'Error closing statement'
-      allow_any_instance_of(SQLite3::Statement).to receive(:close).
-                                                   and_raise(close_err)
-      File.open(Rails.root.join("log/test.log")) do |f|
-        f.seek(0, IO::SEEK_END)
-        expect{Marty::Logger.info('ensure message', [1,2,3])}.not_to raise_error
-        rails_log = f.readlines
-        expect(rails_log).to eq(["ensure message\n"])
-        allow_any_instance_of(SQLite3::Statement).to receive(:close).
-                                                      and_call_original
-        sleep 1
-        Marty::Log.cleanup(0)
-      end
+      expect(log.details).to eq({ "message" => the_error,
+                                  "data" => JSON.parse(data.to_json)})
     end
   end
+
   describe "Exercise" do
     before(:all) do
       @clean_file = "/tmp/clean_#{Process.pid}.psql"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.44
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -477,6 +477,7 @@ files:
 - db/migrate/300_create_marty_api_configs.rb
 - db/migrate/301_create_marty_api_log.rb
 - db/migrate/302_add_api_configs_validate_result.rb
+- db/migrate/303_create_marty_logs.rb
 - db/seeds.rb
 - delorean/script_report.dl
 - gemini_deprecations.md