2011-02-11 22:17:06 +01:00
|
|
|
<?php
|
|
|
|
|
Improve error messages for PHABRICATOR_ENV
Summary:
- Allow user to specify "myconf" (recommended) or "myconf.conf.php" (less
surprising).
- Make sure syntax errors and other problems are surfaced.
- If the configuration value isn't valid, give them a list of all valid
values.
Test Plan:
- Added a syntax error, got a useful error.
- Set PHABRICATOR_ENV to a silly value, got a list of valid values.
- Set PHABRICATOR_ENV to have .conf.php suffix, site still worked.
Reviewed By: kevinwallace
Reviewers: kevinwallace, codeblock, aran, jungejason, tuomaspelkonen
CC: aran, epriestley, kevinwallace
Differential Revision: 381
2011-05-31 04:52:51 +02:00
|
|
|
function phabricator_read_config_file($original_config) {
|
|
|
|
|
2011-02-11 22:17:06 +01:00
|
|
|
$root = dirname(dirname(__FILE__));
|
Improve error messages for PHABRICATOR_ENV
Summary:
- Allow user to specify "myconf" (recommended) or "myconf.conf.php" (less
surprising).
- Make sure syntax errors and other problems are surfaced.
- If the configuration value isn't valid, give them a list of all valid
values.
Test Plan:
- Added a syntax error, got a useful error.
- Set PHABRICATOR_ENV to a silly value, got a list of valid values.
- Set PHABRICATOR_ENV to have .conf.php suffix, site still worked.
Reviewed By: kevinwallace
Reviewers: kevinwallace, codeblock, aran, jungejason, tuomaspelkonen
CC: aran, epriestley, kevinwallace
Differential Revision: 381
2011-05-31 04:52:51 +02:00
|
|
|
|
|
|
|
// Accept either "myconfig" (preferred) or "myconfig.conf.php".
|
|
|
|
$config = preg_replace('/\.conf\.php$/', '', $original_config);
|
|
|
|
$full_config_path = $root.'/conf/'.$config.'.conf.php';
|
|
|
|
|
|
|
|
// Make sure config file errors are reported.
|
|
|
|
$old_error_level = error_reporting(E_ALL | E_STRICT);
|
|
|
|
$old_display_errors = ini_get('display_errors');
|
|
|
|
ini_set('display_errors', 1);
|
|
|
|
|
|
|
|
ob_start();
|
|
|
|
$conf = include $full_config_path;
|
|
|
|
$errors = ob_get_clean();
|
|
|
|
|
|
|
|
error_reporting($old_error_level);
|
|
|
|
ini_set('display_errors', $old_display_errors);
|
|
|
|
|
2011-02-11 22:17:06 +01:00
|
|
|
if ($conf === false) {
|
Improve error messages for PHABRICATOR_ENV
Summary:
- Allow user to specify "myconf" (recommended) or "myconf.conf.php" (less
surprising).
- Make sure syntax errors and other problems are surfaced.
- If the configuration value isn't valid, give them a list of all valid
values.
Test Plan:
- Added a syntax error, got a useful error.
- Set PHABRICATOR_ENV to a silly value, got a list of valid values.
- Set PHABRICATOR_ENV to have .conf.php suffix, site still worked.
Reviewed By: kevinwallace
Reviewers: kevinwallace, codeblock, aran, jungejason, tuomaspelkonen
CC: aran, epriestley, kevinwallace
Differential Revision: 381
2011-05-31 04:52:51 +02:00
|
|
|
if (!Filesystem::pathExists($full_config_path)) {
|
|
|
|
$files = id(new FileFinder($root.'/conf/'))
|
|
|
|
->withType('f')
|
|
|
|
->withSuffix('conf.php')
|
|
|
|
->withFollowSymlinks(true)
|
|
|
|
->find();
|
|
|
|
|
|
|
|
foreach ($files as $key => $file) {
|
|
|
|
$file = trim($file, './');
|
|
|
|
$files[$key] = preg_replace('/\.conf\.php$/', '', $file);
|
|
|
|
}
|
|
|
|
$files = " ".implode("\n ", $files);
|
|
|
|
|
|
|
|
throw new Exception(
|
|
|
|
"CONFIGURATION ERROR\n".
|
|
|
|
"Config file '{$original_config}' does not exist. Valid config files ".
|
|
|
|
"are:\n\n".$files);
|
|
|
|
}
|
|
|
|
throw new Exception("Failed to read config file '{$config}': {$errors}");
|
2011-02-11 22:17:06 +01:00
|
|
|
}
|
Improve error messages for PHABRICATOR_ENV
Summary:
- Allow user to specify "myconf" (recommended) or "myconf.conf.php" (less
surprising).
- Make sure syntax errors and other problems are surfaced.
- If the configuration value isn't valid, give them a list of all valid
values.
Test Plan:
- Added a syntax error, got a useful error.
- Set PHABRICATOR_ENV to a silly value, got a list of valid values.
- Set PHABRICATOR_ENV to have .conf.php suffix, site still worked.
Reviewed By: kevinwallace
Reviewers: kevinwallace, codeblock, aran, jungejason, tuomaspelkonen
CC: aran, epriestley, kevinwallace
Differential Revision: 381
2011-05-31 04:52:51 +02:00
|
|
|
|
2011-02-11 22:17:06 +01:00
|
|
|
return $conf;
|
|
|
|
}
|