Switch to attr_accessor for log function

Signed-off-by: Eric Herot <[email protected]>

Author: eherot

lib/fluent/plugin/in_sql.rb

@@ -60,13 +60,16 @@ class TableElement
       config_param :time_column, :string, default: nil
       config_param :primary_key, :string, default: nil
 
+      attr_reader :log
+
       def configure(conf)
         super
       end
 
-      def init(tag_prefix, base_model, router)
+      def init(tag_prefix, base_model, router, log)
         @router = router
         @tag = "#{tag_prefix}.#{@tag}" if tag_prefix
+        @log = log
 
         # creates a model for this table
         table_name = @table
@@ -114,7 +117,7 @@ def normalized_time(tv, now)
         begin
           Fluent::EventTime.parse(tv.to_s)
         rescue
-          $log.warn "Message contains invalid timestamp, using current time instead (#{now.inspect})"
+          log.warn "Message contains invalid timestamp, using current time instead (#{now.inspect})"
           now
         end
       end
@@ -226,7 +229,7 @@ def start
       # ignore tables if TableElement#init failed
       @tables.reject! do |te|
         begin
-          te.init(@tag_prefix, @base_model, router)
+          te.init(@tag_prefix, @base_model, router, log)
           log.info "Selecting '#{te.table}' table"
           false
         rescue => e

test/plugin/test_in_sql.rb

@@ -26,7 +26,7 @@ def teardown
       table messages
       tag logs
       update_column updated_at
-      time_column custom_time
+      time_column updated_at
     </table>
   ]
 
@@ -66,18 +66,9 @@ def test_configure
 
   def test_message
     d = create_driver(CONFIG + "select_interval 1")
-
-    start_time = Fluent::EventTime.now
-
-    # Create one message with a valid timestamp containing milliseconds and a time zone
-    Message.create!(message: "message 1", custom_time: '2020-08-27 15:00:16.100758000 -0400')
-
-    # Create one message without a timestamp so that we can test auto-creation
-    Message.create!(message: "message 2 (no timestamp)", custom_time: nil)
-
-    # Create one message with an unparseable timestamp so that we can check that a valid
-    # one is auto-generated.
-    Message.create!(message: "message 3 (bad timestamp)", custom_time: 'foo')
+    Message.create!(message: "message 1")
+    Message.create!(message: "message 2")
+    Message.create!(message: "message 3")
 
     d.end_if do
       d.record_count >= 3
@@ -87,25 +78,15 @@ def test_message
     assert_equal("db.logs", d.events[0][0])
     expected = [
       [d.events[0][1], "message 1"],
-      [d.events[1][1], "message 2 (no timestamp)"],
-      [d.events[2][1], "message 3 (bad timestamp)"],
+      [d.events[1][1], "message 2"],
+      [d.events[2][1], "message 3"],
     ]
-
     actual = [
-      [Fluent::EventTime.parse(d.events[0][2]["custom_time"]), d.events[0][2]["message"]],
-      d.events[1][2]["message"],
-      d.events[2][2]["message"],
+      [Time.parse(d.events[0][2]["updated_at"]).to_i, d.events[0][2]["message"]],
+      [Time.parse(d.events[1][2]["updated_at"]).to_i, d.events[1][2]["message"]],
+      [Time.parse(d.events[2][2]["updated_at"]).to_i, d.events[2][2]["message"]],
     ]
-
-    assert_equal(expected[0], actual[0])
-
-    # Messages 2 and 3 should have the same messages but (usually) a slightly later
-    # timestamps because they are generated by the input plugin instead of the test
-    # code
-    [1,2].each do |i|
-      assert_equal(expected[i][1], actual[i])
-      assert_operator(expected[i][0], :>=, start_time)
-    end
+    assert_equal(expected, actual)
   end
 
   class Message < ActiveRecord::Base