Commit ade8283d authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3407] Fixed a couple of typos and other minor issues.

parent 113fdc1f
......@@ -135,7 +135,7 @@ its configuration from file and encountered an error. This is likely due to
invalid content in the configuration file. The application should continue
to operate under its current configuration.
% DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD OS signal %1 received, reloading configurationfrom file: %2
% DHCP_DDNS_CFG_FILE_RELOAD_SIGNAL_RECVD OS signal %1 received, reloading configuration from file: %2
This is an informational message indicating the application has received a signal
instructing it to reload its configuration from file.
......@@ -466,8 +466,9 @@ to shut down by the controller.
This is an informational message indicating the application has received a signal
instructing it to shutdown.
% DHCP_DDNS_SIGNAL_ERROR signal handler for signal %1, threw an unexpected exception: %2
This is an error message indicating that the application encountered an unexpected error after receiving a signal. This is a programmatic error and should be
% DHCP_DDNS_SIGNAL_ERROR signal handler for signal %1, threw an unexpected exception: %2
This is an error message indicating that the application encountered an unexpected
error after receiving a signal. This is a programmatic error and should be
reported. While The application will likely continue to operating, it may be
unable to respond correctly to signals.
......
......@@ -293,7 +293,7 @@ protected:
/// -# SIGHUP - instigates reloading the configuration file
/// -# SIGINT - instigates a graceful shutdown
/// -# SIGTERM - instigates a graceful shutdown
/// If if received any other signal, it will issue a debug statement and
/// If received any other signal, it will issue a debug statement and
/// discard it.
/// Derivations wishing to support additional signals could override this
/// method with one that: processes the signal if it is one of additional
......
......@@ -105,10 +105,10 @@ IOSignalQueue::popSignal(IOSignalId sequence_id) {
"signal not found for sequence_id: " << sequence_id);
}
// Save the siganl so we can return it.
// Save the signal so we can return it.
IOSignalPtr signal = ((*it).second);
// Delete it fromt the queue.
// Delete it from the queue.
signals_.erase(it);
// Return the signal.
......
// Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011, 2104 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......
// Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011, 2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -119,7 +119,7 @@ public:
/// \throw isc::BadValue interval is less than or equal to 0
/// \throw isc::Unexpected internal runtime error
void setup(const Callback& cbfunc, const long interval,
const Mode& = REPEATING);
const Mode& mode = REPEATING);
/// Cancel the timer.
///
......
// Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
// Copyright (C) 2011, 2014 Internet Systems Consortium, Inc. ("ISC")
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
......@@ -300,7 +300,7 @@ TEST_F(IntervalTimerTest, overwriteIntervalTimer) {
EXPECT_EQ(itimer.getInterval(), 100);
}
// This test verifies that timers operate correclty based on their mode.
// This test verifies that timers operate correctly based on their mode.
TEST_F(IntervalTimerTest, intervalModeTest) {
// Create a timer to control the duration of the test.
IntervalTimer test_timer(io_service_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment