main.c (dovecot-2.3.16) | : | main.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 621 | skipping to change at line 621 | |||
return p_strdup(list->pool, abspath); | return p_strdup(list->pool, abspath); | |||
} | } | |||
static void | static void | |||
master_time_moved(const struct timeval *old_time, | master_time_moved(const struct timeval *old_time, | |||
const struct timeval *new_time) | const struct timeval *new_time) | |||
{ | { | |||
long long diff = timeval_diff_usecs(old_time, new_time); | long long diff = timeval_diff_usecs(old_time, new_time); | |||
unsigned int msecs; | unsigned int msecs; | |||
if (diff < 0) | if (diff < 0) { | |||
diff = -diff; | ||||
i_warning("Time moved forwards by %lld.%06lld seconds - adjusting | ||||
timeouts.", | ||||
diff / 1000000, diff % 1000000); | ||||
return; | return; | |||
} | ||||
msecs = (unsigned int)(diff/1000); | msecs = (unsigned int)(diff/1000); | |||
/* time moved backwards. disable launching new service processes | /* time moved backwards. disable launching new service processes | |||
until */ | until the throttling timeout has reached. */ | |||
if (msecs > SERVICE_TIME_MOVED_BACKWARDS_MAX_THROTTLE_MSECS) | if (msecs > SERVICE_TIME_MOVED_BACKWARDS_MAX_THROTTLE_MSECS) | |||
msecs = SERVICE_TIME_MOVED_BACKWARDS_MAX_THROTTLE_MSECS; | msecs = SERVICE_TIME_MOVED_BACKWARDS_MAX_THROTTLE_MSECS; | |||
services_throttle_time_sensitives(services, msecs); | services_throttle_time_sensitives(services, msecs); | |||
i_warning("Time moved backwards by %lld.%06lld seconds, waiting for " | i_warning("Time moved backwards by %lld.%06lld seconds, waiting for " | |||
"%u.%03u seconds until new services are launched again.", | "%u.%03u seconds until new services are launched again.", | |||
diff / 1000000, diff % 1000000, msecs / 1000, msecs % 1000); | diff / 1000000, diff % 1000000, msecs / 1000, msecs % 1000); | |||
} | } | |||
static void daemonize(void) | static void daemonize(void) | |||
{ | { | |||
End of changes. 3 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added |