revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-28 16:30:59 +01:00
Code Issues Releases Wiki Activity

Create phd PID directory if it doesn't exist, and give the user a meaningful

Browse source 
error message if that doesn't work

Summary:
This workflow is needlessly bad right now, make it not terrible.

Also removed some related, unused code.

Test Plan:
Ran 'phd launch nice' with no directory and with a failing mkdir command.

Reviewed By: toulouse
Reviewers: hsb, toulouse, codeblock
CC: aran, toulouse
Differential Revision: 440
This commit is contained in:
epriestley 2011-06-12 21:11:32 -07:00
parent 8ca5581a9c
commit fedbd475b5
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/daemon/phabricator_daemon_launcher.php
View file

@ -24,9 +24,6 @@ require_once $root.'/scripts/__init_env__.php';
phutil_require_module('phabricator', 'infrastructure/daemon/control'); phutil_require_module('phabricator', 'infrastructure/daemon/control');
$control = new PhabricatorDaemonControl(); $control = new PhabricatorDaemonControl();
$phd_dir = PhabricatorEnv::getEnvConfig('phd.pid-directory');
$pid_dir = $phd_dir.'/pid';
switch (isset($argv[1]) ? $argv[1] : 'help') { switch (isset($argv[1]) ? $argv[1] : 'help') {
case 'list': case 'list':
$err = $control->executeListCommand(); $err = $control->executeListCommand();
@ -202,6 +199,3 @@ function phd_load_tracked_repositories() {
return $repositories; return $repositories;
} }

13
src/infrastructure/daemon/control/PhabricatorDaemonControl.php
View file

@ -216,7 +216,18 @@ EOHELP
} }
protected function getControlDirectory($dir) { protected function getControlDirectory($dir) {
return PhabricatorEnv::getEnvConfig('phd.pid-directory').'/'.$dir; $path = PhabricatorEnv::getEnvConfig('phd.pid-directory').'/'.$dir;
if (!Filesystem::pathExists($path)) {
list($err) = exec_manual('mkdir -p %s', $path);
if ($err) {
throw new Exception(
"phd requires the directory '{$path}' to exist, but it does not ".
"exist and could not be created. Create this directory or update ".
"'phd.pid-directory' in your configuration to point to an existing ".
"directory.");
}
}
return $path;
} }
protected function loadAvailableDaemonClasses() { protected function loadAvailableDaemonClasses() {