mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 09:07:02 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: haproxy-systemd-wrapper: Use haproxy in same directory

Browse Source 
Locate the wrapper and use a haproxy executable found in the
same directory.

This patch lets the wrapper work in openSUSE.
This commit is contained in:
Kristoffer Grnlund 2013-11-22 11:06:34 +01:00 committed by Willy Tarreau
parent d32c399747
commit 1b6e75fa84
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/haproxy-systemd-wrapper.c
View File

@ -22,15 +22,30 @@ static char *pid_file = "/run/haproxy.pid";
static int main_argc; static int main_argc;
static char **main_argv; static char **main_argv;
static void locate_haproxy(char *buffer, size_t buffer_size)
{
char* end;
readlink("/proc/self/exe", buffer, buffer_size);
end = strrchr(buffer, '/');
if (end == NULL)
strncpy(buffer, "/usr/sbin/haproxy", buffer_size);
end[1] = '\0';
strncat(buffer, "haproxy", buffer_size);
}
static void spawn_haproxy(char **pid_strv, int nb_pid) static void spawn_haproxy(char **pid_strv, int nb_pid)
{ {
pid_t pid = fork(); char haproxy_bin[512];
pid_t pid;
pid = fork();
if (!pid) { if (!pid) {
/* 3 for "haproxy -Ds -sf" */ /* 3 for "haproxy -Ds -sf" */
char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *)); char **argv = calloc(4 + main_argc + nb_pid + 1, sizeof(char *));
int i; int i;
int argno = 0; int argno = 0;
argv[argno++] = SBINDIR"/haproxy"; locate_haproxy(haproxy_bin, 512);
argv[argno++] = haproxy_bin;
for (i = 0; i < main_argc; ++i) for (i = 0; i < main_argc; ++i)
argv[argno++] = main_argv[i]; argv[argno++] = main_argv[i];
argv[argno++] = "-Ds"; argv[argno++] = "-Ds";