test
/
vieter
forked from vieter-v/vieter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix(cron): don't show error for empty cron schedule

cron
Jef Roosens 2022-04-30 20:48:49 +02:00
parent f9f440500e
commit cfacf9ed0f
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -77,8 +77,8 @@ v/v:
clean: clean:
rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'dvieterctl' 'vieterctl' 'pkg' 'src/vieter' *.pkg.tar.zst 'suvieter' 'afvieter' '$(SRC_DIR)/_docs' rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'dvieterctl' 'vieterctl' 'pkg' 'src/vieter' *.pkg.tar.zst 'suvieter' 'afvieter' '$(SRC_DIR)/_docs'
.PHONY: docs .PHONY: api-docs
docs: api-docs:
rm -rf '$(SRC_DIR)/_docs' rm -rf '$(SRC_DIR)/_docs'
cd '$(SRC_DIR)' && v doc -all -f html -m -readme . cd '$(SRC_DIR)' && v doc -all -f html -m -readme .

1
src/build/build.v
View File

@ -114,7 +114,6 @@ pub fn build_repo(address string, api_key string, base_image_id string, repo &gi
break break
} }
// Wait for 5 seconds
time.sleep(1 * time.second) time.sleep(1 * time.second)
} }

7
src/cron/daemon/daemon.v
View File

@ -132,12 +132,17 @@ pub fn (mut d Daemon) run() ? {
// schedule_build adds the next occurence of the given repo build to the queue. // schedule_build adds the next occurence of the given repo build to the queue.
fn (mut d Daemon) schedule_build(repo_id string, repo git.GitRepo) ? { fn (mut d Daemon) schedule_build(repo_id string, repo git.GitRepo) ? {
ce := parse_expression(repo.schedule) or { ce := if repo.schedule != '' {
parse_expression(repo.schedule) or {
// TODO This shouldn't return an error if the expression is empty. // TODO This shouldn't return an error if the expression is empty.
d.lerror("Error while parsing cron expression '$repo.schedule' ($repo_id): $err.msg()") d.lerror("Error while parsing cron expression '$repo.schedule' ($repo_id): $err.msg()")
d.global_schedule d.global_schedule
} }
} else {
d.global_schedule
}
// A repo that can't be scheduled will just be skipped for now // A repo that can't be scheduled will just be skipped for now
timestamp := ce.next_from_now() ? timestamp := ce.next_from_now() ?