diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-10-27 13:12:50 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-11-16 11:30:35 -0800 |
commit | 195b541f9b0a3e5ead8881a4177ddc1d4bb4af43 (patch) | |
tree | 45c88ab8cfab042ac23cb713eca266adee30091c /lib/chef/compliance | |
parent | aa4fc49bbce33b9a5f17faae24b74d36a427b483 (diff) | |
download | chef-195b541f9b0a3e5ead8881a4177ddc1d4bb4af43.tar.gz |
simplify interval running code
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/compliance')
-rw-r--r-- | lib/chef/compliance/runner.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/chef/compliance/runner.rb b/lib/chef/compliance/runner.rb index 8aa4fe6140..35dd11603e 100644 --- a/lib/chef/compliance/runner.rb +++ b/lib/chef/compliance/runner.rb @@ -107,10 +107,8 @@ class Chef def report_with_interval interval = node["audit"]["interval"] - interval_enabled = node["audit"]["interval"]["enabled"] - interval_time = node["audit"]["interval"]["time"] - if check_interval_settings(interval, interval_enabled, interval_time) - create_timestamp_file if interval_enabled + if check_interval_settings(interval) + create_timestamp_file if interval["enabled"] report else logger.info "Skipping Chef Infra Compliance Phase due to interval settings" @@ -375,10 +373,7 @@ class Chef end def create_timestamp_file - timestamp = Time.now.utc - timestamp_file = File.new(report_timing_file, "w") - timestamp_file.puts(timestamp) - timestamp_file.close + FileUtils.touch report_timing_file end def report_timing_file @@ -394,7 +389,9 @@ class Chef seconds_since_last_run > interval_seconds end - def check_interval_settings(interval, interval_enabled, interval_time) + def check_interval_settings(interval) + interval_enabled = interval["enabled"] + interval_time = interval["time"] # handle intervals interval_seconds = 0 # always run this by default, unless interval is defined if !interval.nil? && interval_enabled |