request-log-analyzer 1.9.9 → 1.9.10

data/spec/unit/file_format/postgresql_format_spec.rb

@@ -12,18 +12,18 @@ describe RequestLogAnalyzer::FileFormat::Postgresql do
     end
 
     it "should parse a :query line correctly" do
-      line = '2004-05-07 11:58:36 LOG:  query: SELECT plugin_id, plugin_name FROM plugins'
-      @file_format.should parse_line(line).as(:query).and_capture(:timestamp => 20040507115836, :query_fragment => 'SELECT plugin_id, plugin_name FROM plugins')
+      line = '2010-10-10 13:52:07 GMT [38747]: [33-1] LOG:  00000: duration: 0.710 ms  statement: SELECT * FROM "delayed_jobs"'
+      @file_format.should parse_line(line).as(:query).and_capture(:timestamp => 20101010135207, :query_fragment => 'SELECT * FROM "delayed_jobs"')
     end
     
     it "should parse a :query_fragment line correctly" do
-      line = '    groups.type_id,users.user_name,users.realname,'
-      @file_format.should parse_line(line).as(:query_fragment).and_capture(:query_fragment => "groups.type_id,users.user_name,users.realname,")
+      line = '    ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at",'
+      @file_format.should parse_line(line).as(:query_fragment).and_capture(:query_fragment => '("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at",')
     end
 
-    it "should parse a :duration line correctly" do
-      line = '2004-05-07 11:58:36 LOG:  duration: 0.002612 sec'
-      @file_format.should parse_line(line).as(:duration).and_capture(:query_time => 0.002612)
+    it "should parse a :query line correctly" do
+      line = '2010-10-10 13:52:07 GMT [38747]: [33-1] LOG:  00000: duration: 0.710 ms  statement: SELECT * FROM "delayed_jobs"'
+      @file_format.should parse_line(line).as(:query).and_capture(:query_time => 0.710)
     end    
   end
 
@@ -33,33 +33,20 @@ describe RequestLogAnalyzer::FileFormat::Postgresql do
     end
 
     it "should parse a multiline query entry correctly" do
-      fixture = <<EOS
-2004-05-07 11:58:22 LOG:  query: SELECT groups.group_name,groups.unix_group_name,
-		groups.type_id,users.user_name,users.realname,
-		news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details 
-		FROM users,news_bytes,groups 
-		WHERE news_bytes.group_id='98' AND news_bytes.is_approved <> '4' 
-		AND users.user_id=news_bytes.submitted_by 
-		AND news_bytes.group_id=groups.group_id 
-		ORDER BY post_date DESC LIMIT 10 OFFSET 0
-2004-05-07 11:58:22 LOG:  duration: 0.002680 sec
-EOS
+      fixture = <<-EOS
+        2010-10-10 15:00:02 GMT [38747]: [1669-1] LOG:  00000: duration: 0.195 ms  statement: INSERT INTO "delayed_jobs" ("failed_at", "locked_by", "created_at", "handler", "updated_at", "priority", "run_at", "attempts", "locked_at", "last_error") VALUES(NULL, NULL, '2010-10-10 15:00:02.159884', E'--- !ruby/object:RuntheChooChootrain {}
+        	', '2010-10-10 15:00:02.159884', 0, '2010-10-10 16:00:00.000000', 0, NULL, NULL) RETURNING "id"
+        2010-10-10 15:00:02 GMT [38747]: [1670-1] LOCATION:  exec_simple_query, postgres.c:1081
+      EOS
+
+      request_counter.should_receive(:hit!).exactly(1).times
+      @log_parser.should_not_receive(:warn)
       @log_parser.parse_io(StringIO.new(fixture)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
-        request[:query].should == "SELECT groups.group_name,groups.unix_group_name, groups.type_id,users.user_name,users.realname, news_bytes.forum_id,news_bytes.summary,news_bytes.post_date,news_bytes.details FROM users,news_bytes,groups WHERE news_bytes.group_id=:string AND news_bytes.is_approved <> :string AND users.user_id=news_bytes.submitted_by AND news_bytes.group_id=groups.group_id ORDER BY post_date DESC LIMIT :int OFFSET :int"
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::Postgresql::Request) && request.completed?
+        request[:query].should == 'INSERT INTO delayed_jobs (failed_at, locked_by, created_at, handler, updated_at, priority, run_at, attempts, locked_at, last_error) VALUES(NULL, NULL, :string, E:string, :string, :int, :string, :int, NULL, NULL) RETURNING id'
       end
     end
 
-    it "should parse a dualline query entry correctly" do
-      fixture = <<EOS
-      2004-05-07 11:58:36 LOG:  query: SELECT type, count FROM project_sums_agg WHERE group_id=59
-      2004-05-07 11:58:36 LOG:  duration: 0.001197 sec
-EOS
-      @log_parser.parse_io(StringIO.new(fixture)) do |request|
-        request.should be_kind_of(RequestLogAnalyzer::FileFormat::Postgresql::Request)
-        request[:query].should == "SELECT type, count FROM project_sums_agg WHERE group_id=:int"
-      end
-    end
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 9
-  version: 1.9.9
+  - 10
+  version: 1.9.10
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency