diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php index 394b4735a5..8fca624b44 100644 --- a/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php +++ b/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php @@ -40,15 +40,20 @@ final class PhabricatorDaemonManagementLogWorkflow $query->withIDs($ids); } $daemons = $query->execute(); + $daemons = mpull($daemons, null, 'getID'); - if (!$daemons) { - if ($ids) { - throw new PhutilArgumentUsageException( - pht('No daemon(s) with id(s) "%s" exist!', implode(', ', $ids))); - } else { - throw new PhutilArgumentUsageException( - pht('No daemons are running.')); + if ($ids) { + foreach ($ids as $id) { + if (!isset($daemons[$id])) { + throw new PhutilArgumentUsageException( + pht( + 'No log record exists for a daemon with ID "%s".', + $id)); + } } + } else if (!$daemons) { + throw new PhutilArgumentUsageException( + pht('No log records exist for any daemons.')); } $console = PhutilConsole::getConsole(); diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php index c2241995e7..5169c08ffd 100644 --- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php +++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php @@ -9,10 +9,6 @@ final class PhabricatorUSEnglishTranslation protected function getTranslations() { return array( - 'No daemon(s) with id(s) "%s" exist!' => array( - 'No daemon with id %s exists!', - 'No daemons with ids %s exist!', - ), 'These %d configuration value(s) are related:' => array( 'This configuration value is related:', 'These configuration values are related:',