RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-22 04:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "BUG/MINOR: clock: fix a few occurrences of 'now' being used in place of 'date'"

Browse Source 
This reverts commit aadcfc9ea6.

The parts affecting the DeviceAtlas addon were wrong actually, the
"now" variable was a local time_t in a file that's not compiled with
the haproxy binary (dadwsch). Only the fix to the calltrace is correct,
so better revert and fix the only one in a separate commit. No backport
is needed.
This commit is contained in:
Willy Tarreau 2023-04-27 18:12:06 +02:00
parent 64651d1769
commit fe1b3b8777
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/deviceatlas/dadwsch.c
View File

@ -44,7 +44,7 @@ static void dadwlog(dw_config_t cfg, const char* msg)
{
time_t now = time(NULL);
char buf[26] = {0};
ctime_r(&date, buf);
ctime_r(&now, buf);
buf[24] = 0;
fprintf(stderr, "%s: %s\n", buf, msg);
}
@ -63,7 +63,7 @@ static dw_status_t dadwnot(void *a, dw_config_t *cfg)
jsond = da_getdatacreation(&o->atlas);
dwgetfinalp(o->dcfg.info, atlasp, sizeof(atlasp));
ctime_r(&jsond, jsondbuf);
ctime_r(&date, buf);
ctime_r(&now, buf);
jsondbuf[24] = 0;
buf[24] = 0;
@ -150,7 +150,7 @@ int main(int argc, char **argv)
if (!dset) {
time_t now = time(NULL);
struct tm *cnow = gmtime(&date);
struct tm *cnow = gmtime(&now);
memcpy(&global_deviceatlassch.o.dcfg.info.rtm, cnow, offsetof(struct tm, tm_mday));
}

2
src/calltrace.c
View File

@ -76,7 +76,7 @@ static int open_trace()
if (!log)
log = stderr;
now_ptr = &date;
now_ptr = &now;
if (getenv("HAPROXY_TRACE_FAST") != NULL) {
fast_time = 1;
now_ptr = &trace_now;