Show logs to the console in 'phd debug'
Summary: Currently we send logs to the logfile in 'phd debug', but we should send them to the console instead. Also fixed some %C stuff which could theoretically cause problems if a user had percentage symbols in their paths (heaven forbid). fratrik, this or D535 might have been involved in frustrating your efforts to debug the "sudo" stuff. Test Plan: Ran "phd debug irc derpderp" and "phd launch irc derpderp". In the former case, the exception appeared in the console. In the latter, it appeared in the log. Reviewed By: codeblock Reviewers: codeblock, jungejason, tuomaspelkonen, aran, fratrik CC: aran, codeblock Differential Revision: 536
This commit is contained in:
@@ -216,17 +216,24 @@ EOHELP
|
||||
"./launch_daemon.php ".
|
||||
"%s ".
|
||||
"--load-phutil-library=%s ".
|
||||
implode(' ', $extra_libraries)." ".
|
||||
"%C ".
|
||||
"--conduit-uri=%s ".
|
||||
"--phd=%s ".
|
||||
"--log=%s ".
|
||||
($debug ? '--trace ' : '--daemonize ').
|
||||
implode(' ', $argv),
|
||||
($debug ? '--trace ' : '--daemonize '),
|
||||
$daemon,
|
||||
phutil_get_library_root('phabricator'),
|
||||
implode(' ', $extra_libraries),
|
||||
PhabricatorEnv::getURI('/api/'),
|
||||
$pid_dir,
|
||||
$log_dir);
|
||||
$pid_dir);
|
||||
|
||||
if (!$debug) {
|
||||
// If we're running "phd debug", send output straight to the console
|
||||
// instead of to a logfile.
|
||||
$command = csprintf("%C --log=%s", $command, $log_dir);
|
||||
}
|
||||
|
||||
// Append the daemon's argv.
|
||||
$command = csprintf("%C %C", $command, implode(' ', $argv));
|
||||
|
||||
if ($debug) {
|
||||
// Don't terminate when the user sends ^C; it will be sent to the
|
||||
|
||||
Reference in New Issue
Block a user