Page MenuHomePhabricator
Files F15341325

D19755.diff
No OneTemporary
Actions

D19755.diff
View Options

diff --git a/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php b/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php
--- a/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php
+++ b/src/applications/daemon/management/PhabricatorDaemonManagementLogWorkflow.php
@@ -40,15 +40,20 @@
$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
--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
@@ -9,10 +9,6 @@
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:',

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 7:43 PM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7226657
Default Alt Text
D19755.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility