aboutsummaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-05 13:03:34 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-05 13:03:34 +0000
commitbbe03f51a82881e0c398aff3ea2d6613a984961f (patch)
tree0d13442199273f205de049bf44903537de943a7e /staging_vespalib
parent8946dbea418f760e4f0a5cbe2eb2bcbcddd25032 (diff)
Äddress review comments.
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/scheduledexecutor.h2
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/util/scheduledexecutor.h b/staging_vespalib/src/vespa/vespalib/util/scheduledexecutor.h
index dd12985aeda..d7e56494828 100644
--- a/staging_vespalib/src/vespa/vespalib/util/scheduledexecutor.h
+++ b/staging_vespalib/src/vespa/vespalib/util/scheduledexecutor.h
@@ -13,7 +13,7 @@ namespace vespalib {
class TimerTask;
/**
- * Timer is a class capable of running Tasks at a regular
+ * ScheduledExecutor is a class capable of running Tasks at a regular
* interval. The timer can be reset to clear all tasks currently being
* scheduled.
*/
diff --git a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp b/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp
index cf8130f97c1..99857107860 100644
--- a/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/shutdownguard.cpp
@@ -16,7 +16,7 @@ void ShutdownGuard::Run(FastOS_ThreadInterface *, void *)
while (_dieAtTime > steady_clock::now() && ! GetThread()->GetBreakFlag()) {
std::this_thread::sleep_for(5ms);
}
- if (_dieAtTime < steady_clock::now()) {
+ if (_dieAtTime <= steady_clock::now()) {
LOG(warning, "ShutdownGuard is now forcing an exit of the process.");
_exit(EXIT_FAILURE);
}