Skip to content

Commit

Permalink
Merge pull request #5 from theckman/fix_invocation
Browse files Browse the repository at this point in the history
fix --event-group and --group flag generation; v0.2.4
  • Loading branch information
theckman authored Jan 24, 2017
2 parents 1757541 + 266ab2d commit 11e9451
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions libraries/lwrp_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ def command_string

c_str << "--label=#{format_string(label)} "
c_str << "--namespace=#{format_string(namespace)} " unless namespace.nil? || namespace.empty?
c_str << "--event_group=#{format_string(event_group)} " unless event_group.nil? || event_group.empty?
c_str << "--metric_group=#{format_string(metric_group)} " unless metric_group.nil? || metric_group.empty?
c_str << "--event-group=#{format_string(event_group)} " unless event_group.nil? || event_group.empty?
c_str << "--group=#{format_string(metric_group)} " unless metric_group.nil? || metric_group.empty?

c_str << "--warn-after=#{warn_after} " if warn_after > 0
c_str << "--wait-secs=#{wait_secs_for_lock} " if lock && wait_secs_for_lock > 0
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

name 'cronner'
version '0.2.3'
version '0.2.4'
license 'Apache 2.0'

description 'Installs/Configures cronner'
Expand Down
2 changes: 1 addition & 1 deletion test/recipes/lwrp_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
its('group') { should eql 'root' }
its('content') { should match /^# Crontab for test_job managed by Chef\./ }
its('content') do
should match %r(^0 12 \* \* \* root /usr/local/bin/cronner --label=test_job --namespace=testenv --event_group=eventgroup --metric_group=metricgroup --warn-after=10 --event --log-fail --lock --sensitive -- /bin/true$)
should match %r(^0 12 \* \* \* root /usr/local/bin/cronner --label=test_job --namespace=testenv --event-group=eventgroup --group=metricgroup --warn-after=10 --event --log-fail --lock --sensitive -- /bin/true$)
end
end

0 comments on commit 11e9451

Please sign in to comment.