Mercurial > sci
diff scictl.c @ 3:215c0c3b3609
misc: use JSON everywhere (scictl/sciwebd)
author | David Demelier <markand@malikania.fr> |
---|---|
date | Mon, 14 Jun 2021 22:08:24 +0200 |
parents | 5fa3d2f479b2 |
children | 9c4fea43803c |
line wrap: on
line diff
--- a/scictl.c Thu Jun 10 10:39:21 2021 +0200 +++ b/scictl.c Mon Jun 14 22:08:24 2021 +0200 @@ -1,4 +1,3 @@ -#define _BSD_SOURCE #include <err.h> #include <stdio.h> #include <stdlib.h> @@ -7,11 +6,9 @@ #include <unistd.h> #include "config.h" -#include "project.h" -#include "job.h" #include "req.h" +#include "types.h" #include "util.h" -#include "worker.h" noreturn static void usage(void) @@ -23,12 +20,11 @@ noreturn static void help(void) { - fprintf(stderr, "usage: %s job-queue project tag\n", getprogname()); - fprintf(stderr, " %s job-list worker\n", getprogname()); - fprintf(stderr, " %s job-save id worker status retcode console\n", getprogname()); + fprintf(stderr, "usage: %s job-add project tag\n", getprogname()); + fprintf(stderr, " %s job-todo worker\n", getprogname()); + fprintf(stderr, " %s jobresult-add id worker exitcode console\n", getprogname()); fprintf(stderr, " %s project-add name desc url script\n", getprogname()); fprintf(stderr, " %s project-list\n", getprogname()); - fprintf(stderr, " %s script-get project\n", getprogname()); fprintf(stderr, " %s worker-add name desc\n", getprogname()); fprintf(stderr, " %s worker-list\n", getprogname()); exit(0); @@ -38,8 +34,7 @@ readfile(const char *path) { FILE *fp, *str; - static char console[SCI_MSG_MAX]; - char buf[BUFSIZ], *ret = console; + char buf[BUFSIZ], *console; size_t nr; if (strcmp(path, "-") == 0) @@ -47,90 +42,157 @@ else if (!(fp = fopen(path, "r"))) err(1, "%s", path); - if (!(str = fmemopen(console, sizeof (console), "w"))) + console = util_calloc(1, SCI_MSG_MAX); + + if (!(str = fmemopen(console, SCI_MSG_MAX, "w"))) err(1, "fmemopen"); while ((nr = fread(buf, 1, sizeof (buf), fp)) > 0) fwrite(buf, 1, nr, str); - if ((ferror(fp) && !feof(fp)) || (ferror(str) && !feof(str))) - ret = NULL; + if ((ferror(fp) && !feof(fp)) || (ferror(str) && !feof(str))) { + free(console); + console = NULL; + } fclose(str); fclose(fp); - return ret; + return console; } static struct req -cmd_job_queue(int argc, char **argv) +cmd_job_add(int argc, char **argv) { struct job job = {0}; + struct project project = {0}; + struct req rp, rj; if (argc < 2) usage(); - strlcpy(job.project.name, argv[0], sizeof (job.project.name)); - strlcpy(job.tag, argv[1], sizeof (job.tag)); + if ((rp = req_project_find(&project, argv[0])).status) + return rp; - return req_job_queue(&job); + job.project_id = project.id; + job.tag = argv[1]; + + rj = req_job_add(&job); + req_finish(&rp); + + return rj; } static struct req -cmd_job_list(int argc, char **argv) +cmd_job_todo(int argc, char **argv) { - struct job_result jobs[SCI_JOB_LIST_MAX]; - size_t jobsz = UTIL_SIZE(jobs); - struct req req; + struct project projects[SCI_PROJECT_MAX] = {0}; + struct job jobs[SCI_JOB_LIST_MAX] = {0}; + struct req rp, rj; + size_t projectsz = UTIL_SIZE(projects), jobsz = UTIL_SIZE(jobs); if (argc < 1) usage(); - if ((req = req_job_list(jobs, &jobsz, argv[0])).status) - return req; + /* First retrieve projects for a better listing. */ + if ((rp = req_project_list(projects, &projectsz)).status) + return rp; - printf("%-16s%-16s%s\n", "ID", "TAG", "PROJECT"); + if ((rj = req_job_todo(jobs, &jobsz, argv[0])).status) { + req_finish(&rp); + return rj; + } for (size_t i = 0; i < jobsz; ++i) { - printf("%-16lld%-16s%s\n", (long long int)jobs[i].job.id, - jobs[i].job.tag, jobs[i].job.project.name); + const char *project = "unknown"; + + /* Find project if exists (it should). */ + for (size_t i = 0; i < projectsz; ++i) { + if (projects[i].id == jobs[i].project_id) { + project = projects[i].name; + break; + } + } + + printf("%-16s%d\n", "id:", jobs[i].id); + printf("%-16s%s\n", "tag:", jobs[i].tag); + printf("%-16s%s\n", "project:", project); + + if (i + 1 < jobsz) + printf("\n"); } - return req; + req_finish(&rp); + + return rj; } static struct req -cmd_job_save(int argc, char **argv) +cmd_jobresult_add(int argc, char **argv) { - struct job_result res = {0}; + struct jobresult res = {0}; + struct worker wk = {0}; + struct req rw, rj; + char *log; if (argc < 5) usage(); - res.job.id = strtoll(argv[0], NULL, 10); - res.status = strtoll(argv[2], NULL, 10); - res.retcode = strtoll(argv[3], NULL, 10); - res.console = readfile(argv[4]); - strlcpy(res.worker.name, argv[1], sizeof (res.worker.name)); + /* Find worker id. */ + if ((rw = req_worker_find(&wk, argv[1])).status) + return rw; - return req_job_save(&res); + res.job_id = strtoll(argv[0], NULL, 10); + res.exitcode = strtoll(argv[2], NULL, 10); + res.worker_id = wk.id; + res.log = log = readfile(argv[3]); + rj = req_jobresult_add(&res); + + free(log); + req_finish(&rw); + + return rj; } static struct req cmd_project_add(int argc, char **argv) { - struct project pc; + struct project pc = {0}; + struct req res; + char *script; if (argc < 4) usage(); - memset(&pc, 0, sizeof (pc)); - strlcpy(pc.name, argv[0], sizeof (pc.name)); - strlcpy(pc.desc, argv[1], sizeof (pc.desc)); - strlcpy(pc.url, argv[2], sizeof (pc.url)); - strlcpy(pc.script, argv[3], sizeof (pc.script)); + pc.name = argv[0]; + pc.desc = argv[1]; + pc.url = argv[2]; + pc.script = script = readfile(argv[3]); + res = req_project_add(&pc); + + free(script); + + return res; +} - return req_project_add(&pc); +static struct req +cmd_project_find(int argc, char **argv) +{ + struct project project = {0}; + struct req req; + + if (argc < 1) + usage(); + if ((req = req_project_find(&project, argv[0])).status) + return req; + + printf("%-16s%s\n", "name:", project.name); + printf("%-16s%s\n", "desc:", project.desc); + printf("%-16s%s\n", "url:", project.url); + printf("\n"); + printf("%s", project.script); + + return req; } static struct req @@ -139,43 +201,21 @@ (void)argc; (void)argv; - struct project pc[SCI_PROJECT_MAX]; + struct project projects[SCI_PROJECT_MAX] = {0}; struct req req; - size_t pcsz = UTIL_SIZE(pc); + size_t projectsz = UTIL_SIZE(projects); - memset(pc, 0, sizeof (pc)); - - if ((req = req_project_list(pc, &pcsz)).status) + if ((req = req_project_list(projects, &projectsz)).status) return req; - printf("%-16s%-24s%-20s%s\n", "NAME", "DESCRIPTION", "URL", "SCRIPT"); - - for (size_t i = 0; i < pcsz; ++i) - printf("%-16s%-24s%-20s%s\n", pc[i].name, pc[i].desc, - pc[i].url, pc[i].script); - - return req; -} + for (size_t i = 0; i < projectsz; ++i) { + printf("%-16s%s\n", "name:", projects[i].name); + printf("%-16s%s\n", "desc:", projects[i].desc); + printf("%-16s%s\n", "url:", projects[i].url); -static struct req -cmd_script_get(int argc, char **argv) -{ - char script[SCI_MSG_MAX]; - struct req req; - - if (argc < 1) - usage(); - if ((req = req_script_get(argv[0], script, sizeof (script))).status) - return req; - - printf("%s", script); - - /* - * Don't break up the terminal output if the script does not contain a - * final new line. - */ - if (script[strlen(script) - 1] != '\n') - printf("\n"); + if (i + 1 < projectsz) + printf("\n"); + } return req; } @@ -183,14 +223,13 @@ static struct req cmd_worker_add(int argc, char **argv) { - struct worker wk; + struct worker wk = {0}; if (argc < 2) usage(); - memset(&wk, 0, sizeof (wk)); - strlcpy(wk.name, argv[0], sizeof (wk.name)); - strlcpy(wk.desc, argv[1], sizeof (wk.desc)); + wk.name = argv[0]; + wk.desc = argv[1]; return req_worker_add(&wk); } @@ -208,10 +247,13 @@ if ((req = req_worker_list(wk, &wksz)).status) return req; - printf("%-16s%s\n", "NAME", "DESCRIPTION"); + for (size_t i = 0; i < wksz; ++i) { + printf("%-16s%s\n", "name:", wk[i].name); + printf("%-16s%s\n", "desc:", wk[i].desc); - for (size_t i = 0; i < wksz; ++i) - printf("%-16s%s\n", wk[i].name, wk[i].desc); + if (i + 1 < wksz) + printf("\n"); + } return req; } @@ -220,12 +262,12 @@ const char *name; struct req (*exec)(int, char **); } commands[] = { - { "job-queue", cmd_job_queue }, - { "job-list", cmd_job_list }, - { "job-save", cmd_job_save }, + { "job-add", cmd_job_add }, + { "job-todo", cmd_job_todo }, + { "jobresult-add", cmd_jobresult_add }, { "project-add", cmd_project_add }, + { "project-find", cmd_project_find }, { "project-list", cmd_project_list }, - { "script-get", cmd_script_get }, { "worker-add", cmd_worker_add }, { "worker-list", cmd_worker_list }, { NULL, NULL } @@ -234,7 +276,6 @@ int main(int argc, char **argv) { - const char *sock = VARDIR "/run/sci.sock"; int ch, cmdfound = 0; setprogname("scictl"); @@ -242,7 +283,7 @@ while ((ch = getopt(argc, argv, "s:")) != -1) { switch (ch) { case 's': - sock = optarg; + req_set_path(optarg); break; default: break; @@ -256,8 +297,6 @@ usage(); if (strcmp(argv[0], "help") == 0) help(); - if (req_connect(sock) < 0) - err(1, "%s", sock); for (size_t i = 0; commands[i].name; ++i) { struct req res; @@ -266,15 +305,16 @@ res = commands[i].exec(--argc, ++argv); cmdfound = 1; +#if 0 if (res.status) warnx("%s", res.msg); +#endif + req_finish(&res); break; } } if (!cmdfound) errx(1, "abort: command %s not found", argv[0]); - - req_finish(); }