RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-26 14:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: init: report the haproxy version and executable path once on errors

Browse Source 
If haproxy fails to start and emits an alert, then it can be useful
to have it also emit the version and the path used to load it. Some
users may be mistakenly launching the wrong binary due to a misconfigured
PATH variable and this will save them some troubleshooting time when it
reports that some keywords are not understood.

What we do here is that we *try* to extract the binary name from the
AUX vector on glibc, and we report this as a NOTICE tag before the
very first alert is emitted.
This commit is contained in:
Willy Tarreau 2020-04-16 10:52:41 +02:00
parent d425950c68
commit bb86986253
4 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/standard.h
View File

@ -1496,6 +1496,7 @@ void dump_addr_and_bytes(struct buffer *buf, const char *pfx, const void *addr,
void dump_hex(struct buffer *out, const char *pfx, const void *buf, int len, int unsafe);
int may_access(const void *ptr);
void *resolve_sym_name(struct buffer *buf, const char *pfx, void *addr);
const char *get_exec_path();
#if defined(USE_BACKTRACE)
/* Note that this may result in opening libgcc() on first call, so it may need

1
include/types/global.h
View File

@ -245,6 +245,7 @@ extern unsigned char boot_seed[20]; // per-boot random seed (160 bits initially
/* bit values to go with "warned" above */
#define WARN_ANY 0x00000001 /* any warning was emitted */
#define WARN_FORCECLOSE_DEPRECATED 0x00000002
#define WARN_EXEC_PATH 0x00000004 /* executable path already reported */
/* to be used with warned and WARN_* */

9
src/log.c
View File

@ -29,6 +29,7 @@
#include <common/initcall.h>
#include <common/standard.h>
#include <common/time.h>
#include <common/version.h>
#include <types/cli.h>
#include <types/global.h>
@ -1109,6 +1110,14 @@ void ha_alert(const char *fmt, ...)
va_list argp;
if (!(global.mode & MODE_QUIET) || (global.mode & (MODE_VERBOSE | MODE_STARTING))) {
if (!(warned & WARN_EXEC_PATH)) {
const char *path = get_exec_path();
warned |= WARN_EXEC_PATH;
ha_notice("haproxy version is %s\n", haproxy_version);
if (path)
ha_notice("path to executable is %s\n", path);
}
va_start(argp, fmt);
print_message("ALERT", fmt, argp);
va_end(argp);

20
src/standard.c
View File

@ -16,6 +16,10 @@
#include <link.h>
#endif
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
#include <sys/auxv.h>
#endif
#include <ctype.h>
#include <errno.h>
#include <netdb.h>
@ -4335,6 +4339,22 @@ void debug_hexdump(FILE *out, const char *pfx, const char *buf,
}
}
/* Tries to report the executable path name on platforms supporting this. If
* not found or not possible, returns NULL.
*/
const char *get_exec_path()
{
const char *ret = NULL;
#if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16))
long execfn = getauxval(AT_EXECFN);
if (execfn && execfn != ENOENT)
ret = (const char *)execfn;
#endif
return ret;
}
#ifdef __ELF__
/* calls dladdr() or dladdr1() on <addr> and <dli>. If dladdr1 is available,
* also returns the symbol size in <size>, otherwise returns 0 there.