commit - b693021b3144f7b681f0f47275f4ba0e397881986186933f737c97a331edf740
commit + 7e80e47cc1227e3fa632c2bffdc9cc8ad6e05ee930bc80c2b64111f4c8b016b5
blob - f56f2b67936035a96dcf090b0339a67951a4864eb09d4531e0c369cc141e175a
blob + 73ea1553e494ad428a28fd0058e1f61924ae8bdd4b978fe69607d0ef63ef139d
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
close(p[1]);
argv[argc++] = argv0;
- if (proc_type == GOTWEBD_PROC_SERVER) {
+ if (proc_type == GOTWEBD_PROC_SOCKETS) {
char *s;
argv[argc++] = "-S";
no_action = 1;
break;
case 'S':
- proc_type = GOTWEBD_PROC_SERVER;
+ proc_type = GOTWEBD_PROC_SOCKETS;
i = strtonum(optarg, 1, INT_MAX, &errstr);
if (errstr)
gotwebd_username = optarg;
www_username = env->www_user;
}
- if (proc_type == GOTWEBD_PROC_SERVER) {
+ if (proc_type == GOTWEBD_PROC_SOCKETS) {
env->worker_load = calloc(env->prefork,
sizeof(env->worker_load[0]));
if (env->worker_load == NULL)
log_setverbose(env->gotwebd_verbose);
switch (proc_type) {
- case GOTWEBD_PROC_SERVER:
+ case GOTWEBD_PROC_SOCKETS:
setproctitle("sockets");
log_procinit("sockets");
fatal("calloc");
spawn_process(env, argv0, env->iev_sockets,
- GOTWEBD_PROC_SERVER, gotwebd_username,
+ GOTWEBD_PROC_SOCKETS, gotwebd_username,
gotwebd_dispatch_server);
spawn_process(env, argv0, env->iev_fcgi,
blob - 13ed57ef88d4c8724159b75a5eafbbba27a87d8edd819c1dc9c33a95c417e2b6
blob + 69b36417e2580cfaaa27529fc60fe791c97b5e7bf798d08efd2fc507a5676260
--- gotwebd/gotwebd.h
+++ gotwebd/gotwebd.h
enum gotwebd_proc_type {
GOTWEBD_PROC_PARENT,
- GOTWEBD_PROC_SERVER,
+ GOTWEBD_PROC_SOCKETS,
GOTWEBD_PROC_FCGI,
GOTWEBD_PROC_GOTWEB,
};
blob - f1197ce8300e4cd3eea238e3658e9ef37a55557151a1563ca637627c491733b3
blob + c34ab5f2b591b12494b009701cd7bff3587ce6c759e7e39cee735f8c7a8bbff8
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
iev_gotweb = select_worker(c);
ret = imsg_compose_event(iev_gotweb, GOTWEBD_IMSG_REQ_PROCESS,
- GOTWEBD_PROC_SERVER, -1, c->fd, &ic, sizeof(ic));
+ GOTWEBD_PROC_SOCKETS, -1, c->fd, &ic, sizeof(ic));
if (ret == -1) {
log_warn("imsg_compose_event");
c->worker_idx = -1;
ret = imsg_compose_event(env->iev_fcgi,
GOTWEBD_IMSG_FCGI_PARSE_PARAMS,
- GOTWEBD_PROC_SERVER, -1, -1, &rec, sizeof(rec));
+ GOTWEBD_PROC_SOCKETS, -1, -1, &rec, sizeof(rec));
if (ret == -1)
log_warn("imsg_compose_event");