Skip to content

Downtime#Start(): trigger fixed downtimes immediately instead of waiting for the timer #8891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2021
Merged

Downtime#Start(): trigger fixed downtimes immediately instead of waiting for the timer #8891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a038f51
Bump OpenSSL to 1.1.1k
julianbrost Jul 7, 2021
4216ed0
Downtime#Start(): trigger fixed downtimes immediately instead of wait…
Al2Klimov Jun 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/win-dev.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function ThrowOnNativeFailure {
$VsVersion = 2019
$MsvcVersion = '14.2'
$BoostVersion = @(1, 71, 0)
$OpensslVersion = '1_1_1h'
$OpensslVersion = '1_1_1k'

switch ($Env:BITS) {
32 { }
Expand Down
8 changes: 8 additions & 0 deletions lib/icinga/downtime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,14 @@ void Downtime::Start(bool runtimeCreated)
<< " Triggering downtime now.";
TriggerDowntime();
}

if (GetFixed() && CanBeTriggered()) {
/* Send notifications. */
OnDowntimeStarted(this);

/* Trigger fixed downtime immediately. */
TriggerDowntime();
}
}

void Downtime::Stop(bool runtimeRemoved)
Expand Down
2 changes: 1 addition & 1 deletion tools/win32/configure.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (-not (Test-Path env:CMAKE_GENERATOR_PLATFORM)) {
}
}
if (-not (Test-Path env:OPENSSL_ROOT_DIR)) {
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1h-Win${env:BITS}"
$env:OPENSSL_ROOT_DIR = "c:\local\OpenSSL_1_1_1k-Win${env:BITS}"
}
if (-not (Test-Path env:BOOST_ROOT)) {
$env:BOOST_ROOT = "c:\local\boost_1_71_0-Win${env:BITS}"
Expand Down