diff options
| author | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-05-05 15:49:07 -0700 |
| commit | 6c6b5a88f18f714924530d64486cb88c02bd7ee4 (patch) | |
| tree | 3a663822de4c279da8287db04f0a42cfb2c407fb /lib/leap_cli/logger.rb | |
| parent | 51195b20531c4dcdf6a76e6a9a8ef7a771cf76be (diff) | |
| parent | 61fdf41087b480db12720df5d5beadd32992475a (diff) | |
Merge branch 'develop'
Conflicts:
lib/leap_cli/commands/db.rb
lib/leap_cli/commands/vagrant.rb
Diffstat (limited to 'lib/leap_cli/logger.rb')
| -rw-r--r-- | lib/leap_cli/logger.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/leap_cli/logger.rb b/lib/leap_cli/logger.rb index 3560d21..328dc27 100644 --- a/lib/leap_cli/logger.rb +++ b/lib/leap_cli/logger.rb @@ -113,8 +113,8 @@ module LeapCli { :match => /sh: .+: command not found/, :color => :magenta, :match_level => 1, :priority => -30 }, # IMPORTANT - { :match => /^err ::/, :color => :red, :match_level => 0, :priority => -10 }, - { :match => /^ERROR:/, :color => :red, :match_level => 0, :priority => -10 }, + { :match => /^err ::/, :color => :red, :match_level => 0, :priority => -10, :exit => 1}, + { :match => /^ERROR:/, :color => :red, :priority => -10, :exit => 1}, { :match => /.*/, :color => :blue, :match_level => 0, :priority => -20 }, # CLEANUP @@ -136,8 +136,8 @@ module LeapCli { :match => /^warning:/, :level => 0, :color => :yellow, :priority => -20}, { :match => /^Duplicate declaration:/, :level => 0, :color => :red, :priority => -20}, { :match => /Finished catalog run/, :level => 0, :color => :green, :priority => -10}, - { :match => /^Puppet apply complete \(changes made\)/, :level => 0, :color => :green, :priority => -10}, - { :match => /^Puppet apply complete \(no changes\)/, :level => 0, :color => :green, :priority => -10}, + { :match => /^APPLY COMPLETE \(changes made\)/, :level => 0, :color => :green, :priority => -10}, + { :match => /^APPLY COMPLETE \(no changes\)/, :level => 0, :color => :green, :priority => -10}, # PUPPET FATAL ERRORS { :match => /^err:/, :level => 0, :color => :red, :priority => -1, :exit => 1}, @@ -146,7 +146,7 @@ module LeapCli { :match => /^Syntax error/, :level => 0, :color => :red, :priority => -1, :exit => 1}, { :match => /^Cannot reassign variable/, :level => 0, :color => :red, :priority => -1, :exit => 1}, { :match => /^Could not find template/, :level => 0, :color => :red, :priority => -1, :exit => 1}, - { :match => /^Puppet apply complete.*fail/, :level => 0, :color => :red, :priority => -1, :exit => 1}, + { :match => /^APPLY COMPLETE.*fail/, :level => 0, :color => :red, :priority => -1, :exit => 1}, # TESTS { :match => /^PASS: /, :color => :green, :priority => -20}, |