mirror of
https://github.com/Icinga/icinga2.git
synced 2025-07-07 13:54:38 +02:00
Fix spelling errors.
* occured -> occurred * dosen't -> doesn't
This commit is contained in:
parent
15a8f87ac1
commit
0891380789
@ -94,7 +94,7 @@ void Socket::Close()
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves the last error that occured for the socket.
|
* Retrieves the last error that occurred for the socket.
|
||||||
*
|
*
|
||||||
* @returns An error code.
|
* @returns An error code.
|
||||||
*/
|
*/
|
||||||
|
@ -221,7 +221,7 @@ void CheckerComponent::ExecuteCheckHelper(const Checkable::Ptr& checkable)
|
|||||||
CheckResult::Ptr cr = new CheckResult();
|
CheckResult::Ptr cr = new CheckResult();
|
||||||
cr->SetState(ServiceUnknown);
|
cr->SetState(ServiceUnknown);
|
||||||
|
|
||||||
String output = "Exception occured while checking '" + checkable->GetName() + "': " + DiagnosticInformation(ex);
|
String output = "Exception occurred while checking '" + checkable->GetName() + "': " + DiagnosticInformation(ex);
|
||||||
cr->SetOutput(output);
|
cr->SetOutput(output);
|
||||||
|
|
||||||
double now = Utility::GetTime();
|
double now = Utility::GetTime();
|
||||||
|
@ -262,7 +262,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
|
|||||||
NodeUtility::UpdateConfiguration("\"conf.d/api-users.conf\"", true, false);
|
NodeUtility::UpdateConfiguration("\"conf.d/api-users.conf\"", true, false);
|
||||||
} else {
|
} else {
|
||||||
Log(LogWarning, "cli")
|
Log(LogWarning, "cli")
|
||||||
<< "Included file dosen't exist " << apiUsersFilePath;
|
<< "Included file doesn't exist " << apiUsersFilePath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ void Checkable::ProcessCheckResult(const CheckResult::Ptr& cr, const MessageOrig
|
|||||||
bool send_notification = false;
|
bool send_notification = false;
|
||||||
|
|
||||||
if (notification_reachable && !in_downtime && !IsAcknowledged()) {
|
if (notification_reachable && !in_downtime && !IsAcknowledged()) {
|
||||||
/* Send notifications whether when a hard state change occured. */
|
/* Send notifications whether when a hard state change occurred. */
|
||||||
if (hardChange && !(old_stateType == StateTypeSoft && IsStateOK(new_state)))
|
if (hardChange && !(old_stateType == StateTypeSoft && IsStateOK(new_state)))
|
||||||
send_notification = true;
|
send_notification = true;
|
||||||
/* Or if the checkable is volatile and in a HARD state. */
|
/* Or if the checkable is volatile and in a HARD state. */
|
||||||
|
@ -76,7 +76,7 @@ void Checkable::SendNotifications(NotificationType type, const CheckResult::Ptr&
|
|||||||
notification->BeginExecuteNotification(type, cr, force, false, author, text);
|
notification->BeginExecuteNotification(type, cr, force, false, author, text);
|
||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
Log(LogWarning, "Checkable")
|
Log(LogWarning, "Checkable")
|
||||||
<< "Exception occured during notification for service '"
|
<< "Exception occurred during notification for service '"
|
||||||
<< GetName() << "': " << DiagnosticInformation(ex);
|
<< GetName() << "': " << DiagnosticInformation(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ void ClusterEvents::ExecuteCheckFromQueue(const MessageOrigin::Ptr& origin, cons
|
|||||||
CheckResult::Ptr cr = new CheckResult();
|
CheckResult::Ptr cr = new CheckResult();
|
||||||
cr->SetState(ServiceUnknown);
|
cr->SetState(ServiceUnknown);
|
||||||
|
|
||||||
String output = "Exception occured while checking '" + host->GetName() + "': " + DiagnosticInformation(ex);
|
String output = "Exception occurred while checking '" + host->GetName() + "': " + DiagnosticInformation(ex);
|
||||||
cr->SetOutput(output);
|
cr->SetOutput(output);
|
||||||
|
|
||||||
double now = Utility::GetTime();
|
double now = Utility::GetTime();
|
||||||
|
@ -524,7 +524,7 @@ void Notification::ExecuteNotificationHelper(NotificationType type, const User::
|
|||||||
<< "' and user '" << user->GetName() << "'.";
|
<< "' and user '" << user->GetName() << "'.";
|
||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
Log(LogWarning, "Notification")
|
Log(LogWarning, "Notification")
|
||||||
<< "Exception occured during notification for checkable '"
|
<< "Exception occurred during notification for checkable '"
|
||||||
<< GetCheckable()->GetName() << "': " << DiagnosticInformation(ex);
|
<< GetCheckable()->GetName() << "': " << DiagnosticInformation(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -130,7 +130,7 @@ void NotificationComponent::NotificationTimerHandler()
|
|||||||
notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
|
notification->BeginExecuteNotification(NotificationProblem, checkable->GetLastCheckResult(), false, true);
|
||||||
} catch (const std::exception& ex) {
|
} catch (const std::exception& ex) {
|
||||||
Log(LogWarning, "NotificationComponent")
|
Log(LogWarning, "NotificationComponent")
|
||||||
<< "Exception occured during notification for object '"
|
<< "Exception occurred during notification for object '"
|
||||||
<< GetName() << "': " << DiagnosticInformation(ex);
|
<< GetName() << "': " << DiagnosticInformation(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
6
third-party/yajl/src/api/yajl_parse.h
vendored
6
third-party/yajl/src/api/yajl_parse.h
vendored
@ -35,7 +35,7 @@ extern "C" {
|
|||||||
yajl_status_ok,
|
yajl_status_ok,
|
||||||
/** a client callback returned zero, stopping the parse */
|
/** a client callback returned zero, stopping the parse */
|
||||||
yajl_status_client_canceled,
|
yajl_status_client_canceled,
|
||||||
/** An error occured during the parse. Call yajl_get_error for
|
/** An error occurred during the parse. Call yajl_get_error for
|
||||||
* more information about the encountered error */
|
* more information about the encountered error */
|
||||||
yajl_status_error
|
yajl_status_error
|
||||||
} yajl_status;
|
} yajl_status;
|
||||||
@ -192,7 +192,7 @@ extern "C" {
|
|||||||
* parse.
|
* parse.
|
||||||
*
|
*
|
||||||
* If verbose is non-zero, the message will include the JSON
|
* If verbose is non-zero, the message will include the JSON
|
||||||
* text where the error occured, along with an arrow pointing to
|
* text where the error occurred, along with an arrow pointing to
|
||||||
* the specific char.
|
* the specific char.
|
||||||
*
|
*
|
||||||
* \returns A dynamically allocated string will be returned which should
|
* \returns A dynamically allocated string will be returned which should
|
||||||
@ -211,7 +211,7 @@ extern "C" {
|
|||||||
*
|
*
|
||||||
* In the event an error is encountered during parsing, this function
|
* In the event an error is encountered during parsing, this function
|
||||||
* affords the client a way to get the offset into the most recent
|
* affords the client a way to get the offset into the most recent
|
||||||
* chunk where the error occured. 0 will be returned if no error
|
* chunk where the error occurred. 0 will be returned if no error
|
||||||
* was encountered.
|
* was encountered.
|
||||||
*/
|
*/
|
||||||
YAJL_API size_t yajl_get_bytes_consumed(yajl_handle hand);
|
YAJL_API size_t yajl_get_bytes_consumed(yajl_handle hand);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user