hq-log-monitor-server 0.8.0 → 0.8.1

data/lib/hq/log-monitor-server/script.rb

@@ -102,6 +102,12 @@ class Script
 		@db =
 			@mongo[@db_elem["name"]]
 
+		@db["events"].ensure_index \
+			"source.service" => Mongo::ASCENDING,
+			"source.class" => Mongo::ASCENDING,
+			"source.host" => Mongo::ASCENDING,
+			"timestamp" => Mongo::ASCENDING
+
 	end
 
 	def init_server

data/lib/hq/log-monitor-server/service-host-page.rb

@@ -31,26 +31,35 @@ class Script
 
 		# read from database
 
-		all_events =
+		all_events_count =
 			@db["events"]
 				.find({
 					"source.class" => source["class"],
 					"source.host" => source["host"],
 					"source.service" => source["service"],
 				})
-				.sort({
-					"timestamp" => -1,
-				})
-				.to_a
+				.count
 
 		page_size = 100
 		page_num = req.GET["page"].to_i
 
 		page_start = page_num * page_size
 		page_end = page_start + page_size
-		page_count = (all_events.size + page_size - 1) / page_size
+		page_count = (all_events_count + page_size - 1) / page_size
 
-		page_events = all_events[page_start...page_end] || []
+		page_events =
+			@db["events"]
+				.find({
+					"source.class" => source["class"],
+					"source.host" => source["host"],
+					"source.service" => source["service"],
+				})
+				.sort({
+					"timestamp" => -1,
+				})
+				.skip(page_start)
+				.limit(page_size)
+				.to_a
 
 		title =
 			"%s %s \u2014 Log monitor" % [
@@ -115,11 +124,11 @@ class Script
 			esc_ht(title),
 		]
 
-		if all_events.size > page_size || page_num > 0
+		if all_events_count > page_size || page_num > 0
 			pagination html, page_count, page_num
 		end
 
-		if all_events.empty?
+		if all_events_count == 0
 
 			html << "<p>No events have been logged for this service on this " +
 				"host</p>\n"
@@ -196,7 +205,7 @@ class Script
 			html << "</tbody>\n"
 			html << "</table>\n"
 
-			if all_events.size > page_size || page_num > 0
+			if all_events_count > page_size || page_num > 0
 				pagination html, page_count, page_num
 			end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-server
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors: