Page MenuHomePhabricator
Files F15341402

D14780.id35741.diff
No OneTemporary
Actions

D14780.id35741.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -227,7 +227,6 @@
'ConduitCall' => 'applications/conduit/call/ConduitCall.php',
'ConduitCallTestCase' => 'applications/conduit/call/__tests__/ConduitCallTestCase.php',
'ConduitConnectConduitAPIMethod' => 'applications/conduit/method/ConduitConnectConduitAPIMethod.php',
- 'ConduitConnectionGarbageCollector' => 'applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php',
'ConduitEpochParameterType' => 'applications/conduit/parametertype/ConduitEpochParameterType.php',
'ConduitException' => 'applications/conduit/protocol/exception/ConduitException.php',
'ConduitGetCapabilitiesConduitAPIMethod' => 'applications/conduit/method/ConduitGetCapabilitiesConduitAPIMethod.php',
@@ -1884,7 +1883,6 @@
'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php',
'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php',
'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
- 'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php',
'PhabricatorConduitConsoleController' => 'applications/conduit/controller/PhabricatorConduitConsoleController.php',
'PhabricatorConduitController' => 'applications/conduit/controller/PhabricatorConduitController.php',
'PhabricatorConduitDAO' => 'applications/conduit/storage/PhabricatorConduitDAO.php',
@@ -4089,7 +4087,6 @@
'ConduitCall' => 'Phobject',
'ConduitCallTestCase' => 'PhabricatorTestCase',
'ConduitConnectConduitAPIMethod' => 'ConduitAPIMethod',
- 'ConduitConnectionGarbageCollector' => 'PhabricatorGarbageCollector',
'ConduitEpochParameterType' => 'ConduitListParameterType',
'ConduitException' => 'Exception',
'ConduitGetCapabilitiesConduitAPIMethod' => 'ConduitAPIMethod',
@@ -5999,7 +5996,6 @@
'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
'PhabricatorConduitApplication' => 'PhabricatorApplication',
'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
- 'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
'PhabricatorConduitController' => 'PhabricatorController',
'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
diff --git a/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php b/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php
deleted file mode 100644
--- a/src/applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-final class ConduitConnectionGarbageCollector
- extends PhabricatorGarbageCollector {
-
- const COLLECTORCONST = 'conduit.connections';
-
- public function getCollectorName() {
- return pht('Conduit Connections');
- }
-
- public function getDefaultRetentionPolicy() {
- return phutil_units('180 days in seconds');
- }
-
- protected function collectGarbage() {
- $table = new PhabricatorConduitConnectionLog();
- $conn_w = $table->establishConnection('w');
-
- queryfx(
- $conn_w,
- 'DELETE FROM %T WHERE dateCreated < %d
- ORDER BY dateCreated ASC LIMIT 100',
- $table->getTableName(),
- $this->getGarbageEpoch());
-
- return ($conn_w->getAffectedRows() == 100);
- }
-
-}
diff --git a/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
--- a/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
+++ b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
@@ -63,14 +63,6 @@
->truncateString($client_description);
$username = (string)$request->getValue('user');
- // Log the connection, regardless of the outcome of checks below.
- $connection = new PhabricatorConduitConnectionLog();
- $connection->setClient($client);
- $connection->setClientVersion($client_version);
- $connection->setClientDescription($client_description);
- $connection->setUsername($username);
- $connection->save();
-
switch ($client) {
case 'arc':
$server_version = 6;
@@ -154,7 +146,7 @@
}
return array(
- 'connectionID' => $connection->getID(),
+ 'connectionID' => mt_rand(),
'sessionKey' => $session_key,
'userPHID' => $user->getPHID(),
);
diff --git a/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php b/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
deleted file mode 100644
--- a/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-final class PhabricatorConduitConnectionLog extends PhabricatorConduitDAO {
-
- protected $client;
- protected $clientVersion;
- protected $clientDescription;
- protected $username;
-
- protected function getConfiguration() {
- return array(
- self::CONFIG_COLUMN_SCHEMA => array(
- 'client' => 'text255?',
- 'clientVersion' => 'text255?',
- 'clientDescription' => 'text255?',
- 'username' => 'text255?',
- ),
- self::CONFIG_KEY_SCHEMA => array(
- 'key_created' => array(
- 'columns' => array('dateCreated'),
- ),
- ),
- ) + parent::getConfiguration();
- }
-
-}
diff --git a/src/docs/tech/conduit.diviner b/src/docs/tech/conduit.diviner
--- a/src/docs/tech/conduit.diviner
+++ b/src/docs/tech/conduit.diviner
@@ -46,8 +46,7 @@
Console", implemented by @{class:PhabricatorConduitConsoleController} at
`/conduit/`.
-A log of connections and calls is stored by
-@{class:PhabricatorConduitConnectionLog} and
+A log of connections and calls is stored in
@{class:PhabricatorConduitMethodCallLog}, and can be accessed on the web via
@{class:PhabricatorConduitLogController} at `/conduit/log/`.

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 8:06 PM (1 d, 8 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7388952
Default Alt Text
D14780.id35741.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility