myslog 0.0.7 → 0.0.8

data/README.md

@@ -19,9 +19,15 @@ myslog = MySlog.new
 text = <<-EOF
 # Time: 111003 14:17:38
 # User@Host: root[root] @ localhost []
-# Query_time: 0.000270  Lock_time: 0.000097 Rows_sent: 1  Rows_examined: 0
+# Query_time: 0.000270  Lock_time: 0.000097  Rows_sent: 1  Rows_examined: 0
 SET timestamp=1317619058;
 SELECT * FROM life;
+# User@Host: php[php] @  [192.168.10.235]
+# Thread_id: 313  Schema: ename_bbs_dx15  Last_errno: 0  Killed: 0
+# Query_time: 0.031467  Lock_time: 0.000197  Rows_sent: 0  Rows_examined: 0  Rows_affected: 0  Rows_read: 2
+# Bytes_sent: 1243  Tmp_tables: 0  Tmp_disk_tables: 0  Tmp_table_sizes: 0
+SET timestamp=1359008764;
+SELECT * FROM pre_common_session WHERE sid='vWWzwC' AND CONCAT_WS('.', ip1,ip2,ip3,ip4)='192.168.200.57';
 EOF
 
 records = myslog.parse(text)
@@ -30,15 +36,33 @@ records = myslog.parse(text)
 `records` is Array of Hash
 
 ```ruby
-record = records.first
-
-record[:time]          #=> Time(20111003 14:17:38)
-record[:user]          #=> "root[root]"
-record[:host]          #=> "localhost"
-record[:host_ip]       #=> ""
-record[:query_time]    #=> 0.000270
-record[:lock_time]     #=> 0.000097
-record[:rows_sent]     #=> 1
-record[:rows_examined] #=> 0
-record[:sql]           #=> "SET timestamp=1317619058; SELECT * FROM life;"
+records[0]
+#=> {:time => 2011-10-03 14:17:38 +0900,
+#=>  :user => "root[root]",
+#=>  :host => "localhost",
+#=>  :host_ip => "",
+#=>  :query_time => 0.000270,
+#=>  :lock_time => 9.7e-05,
+#=>  :rows_sent => 1,
+#=>  :rows_examined => 0,
+#=>  :sql => "SET timestamp=1317619058; SELECT * FROM life;"}
+records[1]
+#=> {:user => "php[php]",
+#=>  :host => "",
+#=>  :host_ip => "192.168.10.235",
+#=>  :query_time => 0.031467,
+#=>  :lock_time => 0.000197,
+#=>  :rows_sent => 0,
+#=>  :rows_examined => 0,
+#=>  :rows_affected => 0,
+#=>  :rows_read => 2,
+#=>  :thread_id => 313,
+#=>  :schema => "ename_bbs_dx15",
+#=>  :last_errno => 0,
+#=>  :killed => 0,
+#=>  :bytes_sent => 1243,
+#=>  :tmp_tables => 0,
+#=>  :tmp_disk_tables => 0,
+#=>  :tmp_table_sizes => 0,
+#=>  :sql => "SET timestamp=1359008764; SELECT * FROM pre_common_session WHERE sid='vWWzwC' AND CONCAT_WS('.', ip1,ip2,ip3,ip4)='192.168.200.57';"}
 ```

data/lib/myslog.rb

@@ -30,18 +30,15 @@ class MySlog
     while line
       record = []
 
-      if line.start_with? "# Time:"
-        record << line
-        record << lines.shift  # user@host
-        record << lines.shift  # query time
-      else
-        record << line         # user@host
-        record << lines.shift  # query time
+      while line != nil && line.start_with?("#")
+        record << line.strip
+        line = lines.shift
       end
 
       sql = []
-      while (line = lines.shift) != nil && !line.start_with?("#")
+      while line != nil && !line.start_with?("#")
         sql << line.strip
+        line = lines.shift
       end
       record << sql.join(" ")
 
@@ -54,34 +51,42 @@ class MySlog
   def parse_record(records)
     response = {}
 
-    record = records.shift
-    if record.start_with? "# Time:"
-      date = record[8..-1].strip
-      response[:date] = Time.parse(date)
-
-      record = records.shift
-    else
-      response[:date] = nil
-    end
+    while (record = records.shift) != nil
 
-    elems = record.split(" ")
-    response[:user]          = elems[2].strip
-    if elems[5] == nil
-      response[:host]        = nil
-      response[:host_ip]     = elems[4].strip[1...-1]
-    else
-      response[:host]        = elems[4].strip
-      response[:host_ip]     = elems[5].strip[1...-1]
-    end
+      if record.start_with? "# User@Host:"
 
-    record = records.shift
-    elems = record.split(" ")
-    response[:query_time]    = elems[2].to_f
-    response[:lock_time]     = elems[4].to_f
-    response[:rows_sent]     = elems[6].to_i
-    response[:rows_examined] = elems[8].to_i
+        elems = record.split(" ")
+        response[:user]      = elems[2].strip
+        if elems[5] == nil
+          response[:host]    = nil
+          response[:host_ip] = elems[4].strip[1...-1]
+        else
+          response[:host]    = elems[4].strip
+          response[:host_ip] = elems[5].strip[1...-1]
+        end
+      elsif record.start_with? "#"
 
-    response[:sql] = records.shift
+        # split with two space
+        elems = record[2..-1].strip().split "  "
+        if elems.size == 1 && elems[0].start_with?("Time:")
+          response[:date] = Time.parse(record[8..-1].strip)
+        else
+          elems.each do |elem|
+            name, value = elem.split ":"
+            value.strip!
+            case value
+            when /^\d+$/
+              value = value.to_i
+            when /^\d+\.\d+(?:e[-+]\d+)?$/
+              value = value.to_f
+            end
+            response[name.downcase.to_sym] = value
+          end
+        end
+      else
+        response[:sql] = record
+      end
+    end
 
     response
   end

data/myslog.gemspec

@@ -12,6 +12,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "myslog"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.7"
+  gem.version       = "0.0.8"
   gem.add_development_dependency "rspec"
 end

data/spec/myslog.rb

@@ -108,7 +108,7 @@ use webtie;
 
       response.should be_an_instance_of Hash
       %w[
-        date user host host_ip query_time lock_time rows_sent rows_examined sql
+        date user host host_ip time lock_time rows_sent rows_examined sql
       ].each { |k| response.should have_key k.to_sym}
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myslog
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec