Reformat Regexp
Fix show template (missing tr) Separate exercise/verify
This commit is contained in:
parent
de6a44fae6
commit
d027ed719d
3 changed files with 18 additions and 3 deletions
|
@ -1,6 +1,15 @@
|
|||
module SidekiqHelper
|
||||
SIDEKIQ_PS_REGEXP = /\A([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+(.+)\s+(sidekiq.*\])\s+\z/
|
||||
|
||||
SIDEKIQ_PS_REGEXP = /\A
|
||||
(?<pid>\d+)\s+
|
||||
(?<cpu>[\d\.,]+)\s+
|
||||
(?<mem>[\d\.,]+)\s+
|
||||
(?<state>[DRSTWXZNLsl\+<]+)\s+
|
||||
(?<start>.+)\s+
|
||||
(?<command>sidekiq.*\])\s+
|
||||
\z/x
|
||||
|
||||
def parse_sidekiq_ps(line)
|
||||
match = line.match(SIDEKIQ_PS_REGEXP)
|
||||
if match
|
||||
|
|
|
@ -28,9 +28,10 @@
|
|||
%th COMMAND
|
||||
%tbody
|
||||
- @sidekiq_processes.each do |process|
|
||||
%td= gitlab_config.user
|
||||
- parse_sidekiq_ps(process).each do |value|
|
||||
%td= value
|
||||
%tr
|
||||
%td= gitlab_config.user
|
||||
- parse_sidekiq_ps(process).each do |value|
|
||||
%td= value
|
||||
.clearfix
|
||||
%p
|
||||
%i.fa.fa-exclamation-circle
|
||||
|
|
|
@ -5,30 +5,35 @@ describe SidekiqHelper do
|
|||
it 'parses line with time' do
|
||||
line = '55137 10,0 2,1 S+ 2:30pm sidekiq 4.1.4 gitlab [0 of 25 busy] '
|
||||
parts = helper.parse_sidekiq_ps(line)
|
||||
|
||||
expect(parts).to eq(['55137', '10,0', '2,1', 'S+', '2:30pm', 'sidekiq 4.1.4 gitlab [0 of 25 busy]'])
|
||||
end
|
||||
|
||||
it 'parses line with date' do
|
||||
line = '55137 10,0 2,1 S+ Aug 4 sidekiq 4.1.4 gitlab [0 of 25 busy] '
|
||||
parts = helper.parse_sidekiq_ps(line)
|
||||
|
||||
expect(parts).to eq(['55137', '10,0', '2,1', 'S+', 'Aug 4', 'sidekiq 4.1.4 gitlab [0 of 25 busy]'])
|
||||
end
|
||||
|
||||
it 'parses line with two digit date' do
|
||||
line = '55137 10,0 2,1 S+ Aug 04 sidekiq 4.1.4 gitlab [0 of 25 busy] '
|
||||
parts = helper.parse_sidekiq_ps(line)
|
||||
|
||||
expect(parts).to eq(['55137', '10,0', '2,1', 'S+', 'Aug 04', 'sidekiq 4.1.4 gitlab [0 of 25 busy]'])
|
||||
end
|
||||
|
||||
it 'parses line with dot as float separator' do
|
||||
line = '55137 10.0 2.1 S+ 2:30pm sidekiq 4.1.4 gitlab [0 of 25 busy] '
|
||||
parts = helper.parse_sidekiq_ps(line)
|
||||
|
||||
expect(parts).to eq(['55137', '10.0', '2.1', 'S+', '2:30pm', 'sidekiq 4.1.4 gitlab [0 of 25 busy]'])
|
||||
end
|
||||
|
||||
it 'does fail gracefully on line not matching the format' do
|
||||
line = '55137 10.0 2.1 S+ 2:30pm something'
|
||||
parts = helper.parse_sidekiq_ps(line)
|
||||
|
||||
expect(parts).to eq(['?', '?', '?', '?', '?', '?'])
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue