summaryrefslogtreecommitdiff
path: root/lib/oxidized/model/routeros.rb
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
commit8f1ac4ad5503ac4a59d41ebc3f142c1d5d097bfb (patch)
tree8860b268793dd783b9b5cd5d1a255fe1edebfb0e /lib/oxidized/model/routeros.rb
parentcd92bac4a582eb8e19d9d036455591c9684eae72 (diff)
parent34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff)
Merge remote-tracking branch 'upstream/master' into pr-1280
Diffstat (limited to 'lib/oxidized/model/routeros.rb')
-rw-r--r--lib/oxidized/model/routeros.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 6717446..c729126 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -18,9 +18,9 @@ class RouterOS < Oxidized::Model
run_cmd = vars(:remove_secret) ? '/export hide-sensitive' : '/export'
cmd run_cmd do |cfg|
cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
- cfg.gsub! /\\\r\n\s+/, '' # strip new line
- cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
- cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+ cfg.gsub! /\\\r\n\s+/, '' # strip new line
+ cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
+ cfg = cfg.split("\n").reject { |line| line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
cfg.join("\n") + "\n"
end
end