From c2f10f19b156fb4d3b36586575f3802471dc4881 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 2 Apr 2011 15:01:55 -0700 Subject: [PATCH] Fix some daemon ish. --- scripts/__init_env__.php | 4 ++++ .../worker/base/PhabricatorRepositoryCommitParserWorker.php | 2 +- .../repository/worker/commitmessageparser/git/__init__.php | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/__init_env__.php b/scripts/__init_env__.php index ed04b871df..f58ac0a4e8 100755 --- a/scripts/__init_env__.php +++ b/scripts/__init_env__.php @@ -16,6 +16,9 @@ * limitations under the License. */ +$include_path = ini_get('include_path'); +ini_set('include_path', $include_path.':'.dirname(__FILE__).'/../../'); + require_once dirname(dirname(__FILE__)).'/conf/__init_conf__.php'; $env = getenv('PHABRICATOR_ENV'); @@ -30,6 +33,7 @@ $conf['phabricator.env'] = $env; phutil_require_module('phabricator', 'infrastructure/env'); PhabricatorEnv::setEnvConfig($conf); + foreach (PhabricatorEnv::getEnvConfig('load-libraries') as $library) { phutil_load_library($library); } diff --git a/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php b/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php index 20994b2afb..7596b9cd23 100644 --- a/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php +++ b/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php @@ -50,7 +50,7 @@ abstract class PhabricatorRepositoryCommitParserWorker } final protected function shouldQueueFollowupTasks() { - return !!idx($this->getTaskData(), 'only'); + return !idx($this->getTaskData(), 'only'); } abstract protected function parseCommit( diff --git a/src/applications/repository/worker/commitmessageparser/git/__init__.php b/src/applications/repository/worker/commitmessageparser/git/__init__.php index f139ac2819..4f42580c9c 100644 --- a/src/applications/repository/worker/commitmessageparser/git/__init__.php +++ b/src/applications/repository/worker/commitmessageparser/git/__init__.php @@ -10,6 +10,7 @@ phutil_require_module('phabricator', 'applications/repository/worker/commitmessa phutil_require_module('phabricator', 'infrastructure/daemon/workers/storage/task'); phutil_require_module('phutil', 'future/exec'); +phutil_require_module('phutil', 'utils'); phutil_require_source('PhabricatorRepositoryGitCommitMessageParserWorker.php');