Page MenuHomestyx hydra
Files F177236

No OneTemporary
Actions

View Options

diff --git a/src/applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php b/src/applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php
index 3ff26e3db7..fd7de9dd33 100644
--- a/src/applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php
+++ b/src/applications/daemon/garbagecollector/PhabricatorDaemonLogGarbageCollector.php
@@ -1,30 +1,29 @@
<?php
final class PhabricatorDaemonLogGarbageCollector
extends PhabricatorGarbageCollector {
const COLLECTORCONST = 'daemon.logs';
public function getCollectorName() {
return pht('Daemon Logs');
}
public function getDefaultRetentionPolicy() {
return phutil_units('7 days in seconds');
}
protected function collectGarbage() {
$table = new PhabricatorDaemonLog();
$conn_w = $table->establishConnection('w');
queryfx(
$conn_w,
- 'DELETE FROM %T WHERE dateCreated < %d AND status != %s LIMIT 100',
+ 'DELETE FROM %T WHERE dateModified < %d LIMIT 100',
$table->getTableName(),
- $this->getGarbageEpoch(),
- PhabricatorDaemonLog::STATUS_RUNNING);
+ $this->getGarbageEpoch());
return ($conn_w->getAffectedRows() == 100);
}
}
diff --git a/src/applications/daemon/storage/PhabricatorDaemonLog.php b/src/applications/daemon/storage/PhabricatorDaemonLog.php
index 2e61da3872..d3ac485ea2 100644
--- a/src/applications/daemon/storage/PhabricatorDaemonLog.php
+++ b/src/applications/daemon/storage/PhabricatorDaemonLog.php
@@ -1,80 +1,80 @@
<?php
final class PhabricatorDaemonLog extends PhabricatorDaemonDAO
implements PhabricatorPolicyInterface {
const STATUS_UNKNOWN = 'unknown';
const STATUS_RUNNING = 'run';
const STATUS_DEAD = 'dead';
const STATUS_WAIT = 'wait';
const STATUS_EXITING = 'exiting';
const STATUS_EXITED = 'exit';
protected $daemon;
protected $host;
protected $pid;
protected $daemonID;
protected $runningAsUser;
protected $argv;
protected $explicitArgv = array();
protected $status;
protected function getConfiguration() {
return array(
self::CONFIG_SERIALIZATION => array(
'argv' => self::SERIALIZATION_JSON,
'explicitArgv' => self::SERIALIZATION_JSON,
),
self::CONFIG_COLUMN_SCHEMA => array(
'daemon' => 'text255',
'host' => 'text255',
'pid' => 'uint32',
'runningAsUser' => 'text255?',
'status' => 'text8',
'daemonID' => 'text64',
),
self::CONFIG_KEY_SCHEMA => array(
'status' => array(
'columns' => array('status'),
),
- 'dateCreated' => array(
- 'columns' => array('dateCreated'),
- ),
'key_daemonID' => array(
'columns' => array('daemonID'),
'unique' => true,
),
+ 'key_modified' => array(
+ 'columns' => array('dateModified'),
+ ),
),
) + parent::getConfiguration();
}
public function getExplicitArgv() {
$argv = $this->explicitArgv;
if (!is_array($argv)) {
return array();
}
return $argv;
}
/* -( PhabricatorPolicyInterface )----------------------------------------- */
public function getPHID() {
return null;
}
public function getCapabilities() {
return array(
PhabricatorPolicyCapability::CAN_VIEW,
);
}
public function getPolicy($capability) {
return PhabricatorPolicies::POLICY_ADMIN;
}
public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
return false;
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jun 10, 11:48 PM (6 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
141380
Default Alt Text
(3 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)