revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 00:32:42 +01:00
Code Issues Releases Wiki Activity

Dedupe conf loading function.

Browse source 
Summary:

Test Plan:

Reviewers:

CC:
This commit is contained in:
epriestley 2011-02-11 13:17:06 -08:00
parent 5fbeac4abc
commit a4852d4a64
3 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
conf/__init_conf__.php Normal file
View file

@ -0,0 +1,26 @@
<?php
/*
* Copyright 2011 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
function phabricator_read_config_file($config) {
$root = dirname(dirname(__FILE__));
$conf = include $root.'/conf/'.$config.'.conf.php';
if ($conf === false) {
throw new Exception("Failed to read config file '{$config}'.");
}
return $conf;
}

9
scripts/__init_script__.php
View file

@ -31,11 +31,4 @@ if (!ini_get('date.timezone')) {
phutil_load_library(dirname(__FILE__).'/../src/'); phutil_load_library(dirname(__FILE__).'/../src/');
function phabricator_read_config_file($config) { require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
$root = dirname(dirname(__FILE__));
$conf = include $root.'/conf/'.$config.'.conf.php';
if ($conf === false) {
throw new Exception("Failed to read config file '{$config}'.");
}
return $conf;
}

13
webroot/index.php
View file

@ -35,6 +35,8 @@ if (!function_exists('mysql_connect')) {
"the PHP MySQL extension is not installed. This extension is required."); "the PHP MySQL extension is not installed. This extension is required.");
} }
require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php';
$conf = phabricator_read_config_file($env); $conf = phabricator_read_config_file($env);
$conf['phabricator.env'] = $env; $conf['phabricator.env'] = $env;
@ -150,14 +152,3 @@ function setup_aphront_basics() {
function __autoload($class_name) { function __autoload($class_name) {
PhutilSymbolLoader::loadClass($class_name); PhutilSymbolLoader::loadClass($class_name);
} }
function phabricator_read_config_file($config) {
$root = dirname(dirname(__FILE__));
$conf = include $root.'/conf/'.$config.'.conf.php';
if ($conf === false) {
throw new Exception("Failed to read config file '{$config}'.");
}
return $conf;
}