macklog 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62fda172422a1b1139963a312898ac0f630159b
-  data.tar.gz: 93cce5305c530eb41283a5aaa2bf594c9d3f111a
+  metadata.gz: 22fe76b55d8c6450f3e716762e69f4c5b8636cf9
+  data.tar.gz: 0b995005bfaedede0731ff180d06ddc0c78cb6cc
 SHA512:
-  metadata.gz: 04d1ff56fafb4e2b4adff8f8590e9fa906baccba03b0787c5fa8341585d7e26a2ed4e31a97d8033eac4098a727d278b03adca332c569c73be64fbd04e5cd11c4
-  data.tar.gz: 500d341e87ed5c77bda24669238abaec1fd8eaaf0ea804c3ed76702b6d1b3ceff00c0be2821f81b89b47294c279efe93f5bd0f1efb98845c400cb9d937884702
+  metadata.gz: 3cea8c1711ad4402114474f59ed5f6134d0ebb481f73b9202996af51fd079b2e917b9cf3a420d090f952f60e07335c0b2e2b90ebe8bcdc9d09db7ce0a5a8a0c7
+  data.tar.gz: a2e6dfb20e815c3490142d7c8166194ac3f7933332581aa094768f08281db68942548b5d4d18a51f47aa2538dd2a9a829d376728b483df69ebaf3776a41566f7

data/.gitignore

@@ -1,2 +1,3 @@
 /test.*
 /pkg
+/Gemfile.lock

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    macklog (0.1.4)
+    macklog (0.2.0)
       thor
 
 GEM

data/README.md

@@ -5,12 +5,12 @@
 
 
 mackerelのログ監視プラグインです。
-指定したファイルに指定したワードが出力された場合、Criticalアラートを出力します。
+指定したファイルに指定したワードが出力された場合、アラートを出力します。
 
 ## Installation
 
 ```ruby
-gem 'macklog'
+gem install macklog
 ```
 
 ## Usage
@@ -24,7 +24,8 @@ command = "macklog -f /var/log/httpd/error.log -w fatal -i"
 ### options
 ```
 -f : 対象ファイル
--w : 対象キーワード
+-w : warningキーワード
+-c : criticalキーワード
 -i : 大文字小文字を区別しない
 ```
 

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 93.48
+    "covered_percent": 94.23
   }
 }

data/coverage/.resultset.json

@@ -11,6 +11,7 @@
         1,
         1,
         1,
+        1,
         null
       ],
       "/Users/yamashitakazuhiko/src/github.com/pyama86/macklog/lib/macklog/cli.rb": [
@@ -23,61 +24,65 @@
         1,
         1,
         1,
+        1,
         null,
         null,
         null,
         null,
         null,
         null,
-        6,
+        10,
         null,
-        6,
+        10,
         1,
         1,
         null,
-        null,
-        5,
-        null,
+        9,
         5,
-        2,
-        null,
-        null,
         null,
         1,
         1,
-        5,
+        1,
+        11,
+        11,
         null,
-        2,
         null,
-        3,
+        1,
+        11,
         null,
         5,
         null,
+        6,
+        null,
+        11,
+        null,
         null,
         1,
-        2,
-        2,
+        6,
+        6,
         null,
-        2,
-        2,
-        2,
+        6,
+        6,
+        6,
         null,
         0,
         null,
         null,
         null,
         1,
-        2,
-        2,
+        6,
+        6,
         null,
         null,
         null,
         1,
-        3,
-        3,
+        7,
+        7,
         null,
         2,
         null,
+        4,
+        null,
         1,
         null,
         0,
@@ -91,6 +96,6 @@
         null
       ]
     },
-    "timestamp": 1437383134
+    "timestamp": 1438087132
   }
 }

data/lib/macklog.rb

@@ -6,5 +6,6 @@ require "macklog/cli"
 module Macklog
   class Error < StandardError; end
   class FileNotFound < Error; end
-  class MatchWord < Error; end
+  class Critical < Error; end
+  class Warning < Error; end
 end

data/lib/macklog/cli.rb

@@ -4,7 +4,8 @@ module Macklog
   class Cli < Thor
     desc "check", "check log"
     option :file, :type => :string , :required => true, :aliases => '-f'
-    option :word , :type => :string , :required => true, :aliases => '-w'
+    option :critical, :type => :string, :aliases => '-c'
+    option :warning, :type => :string, :aliases => '-w'
     option :ignorecase , :type => :boolean, :aliases => '-i'
     def check
       # exit code
@@ -19,15 +20,16 @@ module Macklog
         puts "#{file_path} not found!"
         exit_status 3
       end
-      
-      result = log_search(file_path, options[:word] , options[:ignorecase])
-      
-      if result && !notified?(file_path, result)
-        exit_status 2
-      end
+      check_log(file_path, options[:critical], 2, options[:ignorecase]) if options[:critical]
+      check_log(file_path, options[:warning], 1, options[:ignorecase]) if options[:warning] 
     end
     default_task :check
     no_tasks do
+      def check_log(file_path, word, status, ignore)
+        result = log_search(file_path, word, ignore)
+        exit_status status if result && !notified?(file_path, result)
+      end
+
       def log_search(file_path, word, ignore=nil)
         result = case
         when ignore
@@ -59,8 +61,10 @@ module Macklog
       def exit_status(status)
         if ENV["MALTCH_TEST"]
           case status
+          when 1
+            raise(Macklog::Warning)
           when 2
-            raise(Macklog::MatchWord)
+            raise(Macklog::Critical)
           when 3
             raise(Macklog::FileNotFound)
           else

data/lib/macklog/version.rb

@@ -1,3 +1,3 @@
 module Macklog
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macklog
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler