RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker: only increment the number of reload in wait mode 

Since the wait mode will be started in any case of succesful or failed
reload, change the way haproxy computes the number of reloads of the
processes.
This commit is contained in:
William Lallemand 2021-11-09 18:43:59 +01:00
parent 836bda226c
commit ad221f4ece
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/haproxy.c
View File

@ -799,7 +799,15 @@ static void mworker_reexec_waitmode()
/* reload haproxy and emit a warning */ /* reload haproxy and emit a warning */
void mworker_reload() void mworker_reload()
{ {
struct mworker_proc *child;
ha_notice("Reloading HAProxy\n"); ha_notice("Reloading HAProxy\n");
/* increment the number of reloads */
list_for_each_entry(child, &proc_list, list) {
child->reloads++;
}
mworker_reexec(); mworker_reexec();
} }

4
src/mworker.c
View File

@ -174,8 +174,8 @@ int mworker_env_to_proc_list()
} else if (strncmp(subtoken, "pid=", 4) == 0) { } else if (strncmp(subtoken, "pid=", 4) == 0) {
child->pid = atoi(subtoken+4); child->pid = atoi(subtoken+4);
} else if (strncmp(subtoken, "reloads=", 8) == 0) { } else if (strncmp(subtoken, "reloads=", 8) == 0) {
/* we reloaded this process once more */ /* we only increment the number of asked reload */
child->reloads = atoi(subtoken+8) + 1; child->reloads = atoi(subtoken+8);
} else if (strncmp(subtoken, "timestamp=", 10) == 0) { } else if (strncmp(subtoken, "timestamp=", 10) == 0) {
child->timestamp = atoi(subtoken+10); child->timestamp = atoi(subtoken+10);
} else if (strncmp(subtoken, "id=", 3) == 0) { } else if (strncmp(subtoken, "id=", 3) == 0) {