Skip to content

Refactor certificate expiry notification handling #3

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

Closed
MSS970 wants to merge 1 commit into from
Closed

Refactor certificate expiry notification handling #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions servcheck_process.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,19 +528,24 @@ function servcheck_run_test(array $test, bool $force): void {

// checks only if test passed or some search string exists
if ($results['result_search'] != 'not tested' && $results['result'] == 'ok') {
if ($last_log['result_search'] != $results['result_search']) {
if ($last_log['result_search'] != $results['result_search'] && ($results['result_search'] == 'failed ok' || $results['result_search'] == 'not ok') ) {
servcheck_debug('Search result changed, notification will be send');
$test['notify_search'] = true;
}
}

// check certificate expiry
if ($test['certexpirenotify'] && $cert_expiry_days > 0 && $test['days_left'] < $cert_expiry_days && $results['result'] == 'ok') {
// notify once per day
$new_notify = db_fetch_cell_prepared('SELECT UNIX_TIMESTAMP(DATE_ADD(last_exp_notify, INTERVAL 1 DAY))
FROM plugin_servcheck_test
WHERE id = ?',
[$test['id']]);
if ($test['certexpirenotify'] && $cert_expiry_days > 0 && $test['days_left'] =< $cert_expiry_days && $results['result'] == 'ok') {
// notify once per $cert_expiry_interval_days
if ($test['days_left'] > 0) {
/* added by MSS on 2026-11-04 */
$cert_expiry_interval_days = read_config_option('servcheck_certificate_expiry_email_interval');
}
// nofify once per day
else {
$cert_expiry_interval_days = 1;
}
$new_notify = db_fetch_cell_prepared('SELECT UNIX_TIMESTAMP(DATE_ADD(last_exp_notify, INTERVAL ' . $cert_expiry_interval_days . ' DAY)) FROM plugin_servcheck_test WHERE id = ?', [$test['id']]);

if ($new_notify < time()) {
servcheck_debug('Certificate will expire soon (or is expired), will notify about expiration');
Expand Down
Loading