Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/346679 )
Change subject: Call a slug what it is ...................................................................... Call a slug what it is Change-Id: Ibe004d848462e58b0fabc974de9474ecf9dd29de --- M bin/run-job 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control refs/changes/79/346679/1 diff --git a/bin/run-job b/bin/run-job index eec5f9f..7df6344 100755 --- a/bin/run-job +++ b/bin/run-job @@ -10,10 +10,12 @@ def list_jobs(): - for job_name in job_spec.list(): + for job_slug in job_spec.list(): try: - job = job_spec.load(job_name) - message = "{job} - {human_name}".format(job=job_name, human_name=job.name) + # FIXME: Nicer if this inner loop moved to Job rather than having + # status come from an ephemeral runner. + job = job_spec.load(job_slug) + message = "{job} - {name}".format(job=job_slug, name=job.name) status = runner.JobRunner(job).status() if status is not None: message += " " + yaml.dump(status).strip() @@ -22,14 +24,17 @@ if job.description is not None: message += "\n " + job.description except AssertionError: - message = "{job} ***Invalid configuration***".format(job=job_name) + message = "{job} ***Invalid configuration***".format(job=job_slug) print(message) if __name__ == "__main__": - parser = argparse.ArgumentParser(description="Run and maintain process-control jobs.") + # TODO: Change the function name or move responsibilities beyond "run" to a + # new script. + parser = argparse.ArgumentParser(description="Run or query `process-control` jobs.") parser.add_argument("-j", "--job", help="Run a given job.", type=str) parser.add_argument("-l", "--list-jobs", help="Print a summary of available jobs.", action='store_true') + # TODO: --kill-job, --disable-group, --enable-group args = parser.parse_args() if args.job: -- To view, visit https://gerrit.wikimedia.org/r/346679 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe004d848462e58b0fabc974de9474ecf9dd29de Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/process-control Gerrit-Branch: master Gerrit-Owner: Awight <awi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits