lib/autoload/kuroko2/workflow/task/wait.rb in kuroko2-0.4.2 vs lib/autoload/kuroko2/workflow/task/wait.rb in kuroko2-0.4.3
- old
+ new
@@ -59,15 +59,14 @@
parse_option(option)
end
private
- # ex. wait: 100/daily 200/daily
+ # e.g wait: 100/daily 200/daily
def parse_option(option, start_at: Time.current)
raise_assertion_error unless option
-
- wait_option = { "jobs" => [], "timeout" => 60.minutes.to_i / 1.minute }
+ wait_option = { "jobs" => [], "timeout" => 60 } # 60 minutes by default
scanner = StringScanner.new(option)
until scanner.eos?
if scanner.scan(OPTION_REGEXP)
start_from, start_to = period_to_time(scanner[2], at: start_at)
wait_option["jobs"] << {
@@ -76,10 +75,10 @@
"start_from" => start_from.to_s,
"start_to" => start_to.to_s,
"received" => false,
}
elsif scanner.scan(/timeout=(\d+)h/)
- wait_option["timeout"] = scanner[1].to_i.hours / 60
+ wait_option["timeout"] = (scanner[1].to_i.hours / 1.minute).to_i
elsif scanner.scan(/timeout=(\d+)m/) || scanner.scan(/timeout=(\d+)/)
wait_option["timeout"] = scanner[1].to_i
elsif scanner.scan(/\s+|,/)
# do nothing
else