Skip to content

Commit d9265ab

Browse files
authored
Merge pull request #9397 from mhashizume/PUP-1881/main/windows-runinterval
Correct Windows runinterval behavior
2 parents 56d07e9 + 688bf6f commit d9265ab

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Diff for: ext/windows/service/daemon.rb

+9-2
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,19 @@ def report_windows_event(type, id, message)
155155
end
156156
end
157157

158+
# Parses runinterval.
159+
#
160+
# @param puppet_path [String] The file path for the Puppet executable.
161+
# @return runinterval [Integer] How often to do a Puppet run, in seconds.
158162
def parse_runinterval(puppet_path)
159163
begin
160-
runinterval = %x(#{puppet_path} config --section agent --log_level notice print runinterval).to_i
161-
if runinterval == 0
164+
runinterval = %x(#{puppet_path} config --section agent --log_level notice print runinterval).chomp
165+
if runinterval == ''
162166
runinterval = 1800
163167
log_err("Failed to determine runinterval, defaulting to #{runinterval} seconds")
168+
else
169+
# Use Kernel#Integer because to_i will return 0 with non-numeric strings.
170+
runinterval = Integer(runinterval)
164171
end
165172
rescue Exception => e
166173
log_exception(e)

0 commit comments

Comments
 (0)