Skip to content

fix incorrect include #134

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
TheWitness merged 3 commits into from
Oct 16, 2026
Merged

fix incorrect include #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5531d57
fix incorrect include
xmacan Oct 15, 2026
bc23e8f
fix syntax error
xmacan Oct 15, 2026
cebedc2
Fix maint include logic and allowlist poller for patch-coverage
TheWitness Oct 15, 2026
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
8 changes: 7 additions & 1 deletion servcheck_process.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,13 @@ function servcheck_run_test(array $test, bool $force): void {
}

if (api_plugin_is_enabled('maint')) {
require_once($config['base_path'] . '/plugins/maint/functions.php');
if (file_exists($config['base_path'] . '/plugins/maint/includes/functions.php')) {
require_once($config['base_path'] . '/plugins/maint/includes/functions.php');
} else if (file_exists($config['base_path'] . '/plugins/maint/functions.php')) {
require_once($config['base_path'] . '/plugins/maint/functions.php');
} else {
cacti_log('ERROR: cannot include maint functions', false, 'SERVCHECK');
}
}

if (function_exists('plugin_maint_check_servcheck_test')) {
Expand Down
1 change: 1 addition & 0 deletions tests/bin/patch-coverage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ function changed_lines($base_ref) {
$unmeasured_allowlist = [
'servcheck_ca.php', // web UI entry point (require auth.php); not loadable in the isolated unit process
'servcheck_credential.php', // web UI entry point (require auth.php); not loadable in the isolated unit process
'servcheck_process.php', // CLI/daemon poller entry point (shebang, chdir + include, pcntl signal handling); not loadable in the isolated unit process
'servcheck_proxy.php', // web UI entry point (require auth.php); not loadable in the isolated unit process
'servcheck_restapi.php', // web UI entry point (require auth.php); not loadable in the isolated unit process
'servcheck_test.php', // web UI entry point (require auth.php); not loadable in the isolated unit process
Expand Down
Loading