hq-log-monitor-client 0.1.1 → 0.1.2

data/features/context.feature

@@ -51,6 +51,7 @@ Feature: Log monitor client provides context lines correctly
         }
       }
       """
+    And the script should return 0
 
   Scenario: Start of large file
 
@@ -83,6 +84,7 @@ Feature: Log monitor client provides context lines correctly
         }
       }
       """
+    And the script should return 0
 
   Scenario: End of large file
 
@@ -115,6 +117,7 @@ Feature: Log monitor client provides context lines correctly
         }
       }
       """
+    And the script should return 0
 
   Scenario: Middle of short file
 
@@ -144,3 +147,4 @@ Feature: Log monitor client provides context lines correctly
         }
       }
       """
+    And the script should return 0

data/features/detect-rotation.feature

@@ -56,6 +56,7 @@ Feature: Log monitor client does detects rotated log files
         },
       }
       """
+    And the script should return 0
 
   Scenario: Log file not rotated
 
@@ -84,3 +85,4 @@ Feature: Log monitor client does detects rotated log files
         },
       }
       """
+    And the script should return 0

data/features/match.feature

@@ -20,43 +20,44 @@ Feature: Log monitor client correctly reports matching lines
   Scenario: Ignore lines which don't match any pattern
 
     Given a file "logfile.log":
-       """
-       NOTICE Not an error
-       """
+      """
+      NOTICE Not an error
+      """
 
-     When I run log-monitor-client with config "default.config"
+    When I run log-monitor-client with config "default.config"
 
-     Then no events should be submitted
+    Then no events should be submitted
+    And the script should return 0
 
   Scenario: Produce events for lines which match a pattern
 
     Given a file "logfile.log":
-       """
-       WARNING This is a warning
-       """
+      """
+      WARNING This is a warning
+      """
 
-     When I run log-monitor-client with config "default.config"
+    When I run log-monitor-client with config "default.config"
 
-     Then the following events should be submitted:
-       """
-       {
-         type: warning,
-         source: { class: class, host: host, service: service },
-         location: { file: logfile.log, line: 0 },
-         lines: {
-           before: [],
-           matching: WARNING This is a warning,
-           after: [],
-         },
-       }
-       """
+    Then the following events should be submitted:
+      """
+      {
+        type: warning,
+        source: { class: class, host: host, service: service },
+        location: { file: logfile.log, line: 0 },
+        lines: {
+          before: [],
+          matching: WARNING This is a warning,
+          after: [],
+        },
+      }
+      """
 
   Scenario: Only produce an event for the first matched pattern
 
     Given a file "logfile.log":
-       """
-       CRITICAL WARNING This is a confused log entry
-       """
+      """
+      CRITICAL WARNING This is a confused log entry
+      """
 
     When I run log-monitor-client with config "default.config"
 
@@ -73,3 +74,4 @@ Feature: Log monitor client correctly reports matching lines
         },
       }
       """
+    And the script should return 0

data/features/skip-files.feature

@@ -19,8 +19,11 @@ Feature: Log monitor client does skips files which don't appear to have changed
       """
 
   Scenario: Ignore lines which don't match any pattern
+
     When I run log-monitor-client with config "default.config"
+
     Then no events should be submitted
+    And the script should return 0
 
   Scenario: Timestamp changed, size unchanged
 
@@ -49,6 +52,7 @@ Feature: Log monitor client does skips files which don't appear to have changed
         },
       }
       """
+    And the script should return 0
 
   Scenario: Size changed, timestamp unchanged
 
@@ -77,6 +81,7 @@ Feature: Log monitor client does skips files which don't appear to have changed
         },
       }
       """
+    And the script should return 0
 
   Scenario: Size and timestamp unchanged
 
@@ -93,3 +98,5 @@ Feature: Log monitor client does skips files which don't appear to have changed
     When I run log-monitor-client with config "default.config"
 
     Then no events should be submitted
+    And the script should return 0
+

data/features/support/steps.rb

@@ -66,3 +66,12 @@ Then /^the following events should be submitted:$/ do
 	events_expected = YAML.load "[#{events_str}]"
 	$events_received.should == events_expected
 end
+
+Then /^the script should return (\d+)$/ do
+	|expect_str|
+
+	expect = expect_str.to_i
+
+	@script.status.should == expect
+
+end

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

@@ -14,11 +14,15 @@ class Script
 	attr_accessor :stderr
 
 	def main
+
 		process_args
 		read_config
 		read_cache
 		perform_checks
 		write_cache
+
+		@status = 0
+
 	end
 
 	def process_args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: