Snarp/zabbix
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1940 from paskal/fix-web-db-port-empty-string

Browse source 
Fix web frontend crash on socket setups without DB_SERVER_PORT
This commit is contained in:
Alexey Pustovalov 2026-07-02 13:46:40 +09:00 committed by GitHub
parent acfd59eac4 cc028ed792
commit 2e4ec3ed1d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
templates/config/web/zabbix.conf.php
View file

@ -6,6 +6,12 @@ function env_string(string $name, string $default = ''): string {
return ($value === false) ? $default : $value; return ($value === false) ? $default : $value;
} }
function env_int(string $name, int $default = 0): int {
$value = getenv($name);
return ($value === false || $value === '') ? $default : (int) $value;
}
function env_bool(string $name, bool $default = false): bool { function env_bool(string $name, bool $default = false): bool {
$value = getenv($name); $value = getenv($name);
@ -40,7 +46,7 @@ function resolve_file(string $default_path, string $env_name): string {
$DB['TYPE'] = env_string('DB_SERVER_TYPE'); $DB['TYPE'] = env_string('DB_SERVER_TYPE');
$DB['SERVER'] = env_string('DB_SERVER_HOST'); $DB['SERVER'] = env_string('DB_SERVER_HOST');
$DB['PORT'] = env_string('DB_SERVER_PORT'); $DB['PORT'] = env_int('DB_SERVER_PORT');
$DB['DATABASE'] = env_string('DB_SERVER_DBNAME'); $DB['DATABASE'] = env_string('DB_SERVER_DBNAME');
$DB['SCHEMA'] = env_string('DB_SERVER_SCHEMA'); $DB['SCHEMA'] = env_string('DB_SERVER_SCHEMA');