Page MenuHomePhabricator
Files F15457223

D12315.diff
No OneTemporary
Actions

D12315.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
@@ -1474,6 +1474,7 @@
'PhabricatorCacheManagementWorkflow' => 'applications/cache/management/PhabricatorCacheManagementWorkflow.php',
'PhabricatorCacheMarkupGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheMarkupGarbageCollector.php',
'PhabricatorCacheSchemaSpec' => 'applications/cache/storage/PhabricatorCacheSchemaSpec.php',
+ 'PhabricatorCacheSpec' => 'applications/cache/spec/PhabricatorCacheSpec.php',
'PhabricatorCacheTTLGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheTTLGarbageCollector.php',
'PhabricatorCaches' => 'applications/cache/PhabricatorCaches.php',
'PhabricatorCalendarApplication' => 'applications/calendar/application/PhabricatorCalendarApplication.php',
@@ -1709,6 +1710,7 @@
'PhabricatorDashboardTransactionQuery' => 'applications/dashboard/query/PhabricatorDashboardTransactionQuery.php',
'PhabricatorDashboardUninstallController' => 'applications/dashboard/controller/PhabricatorDashboardUninstallController.php',
'PhabricatorDashboardViewController' => 'applications/dashboard/controller/PhabricatorDashboardViewController.php',
+ 'PhabricatorDataCacheSpec' => 'applications/cache/spec/PhabricatorDataCacheSpec.php',
'PhabricatorDataNotAttachedException' => 'infrastructure/storage/lisk/PhabricatorDataNotAttachedException.php',
'PhabricatorDatabaseSetupCheck' => 'applications/config/check/PhabricatorDatabaseSetupCheck.php',
'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php',
@@ -2126,6 +2128,7 @@
'PhabricatorObjectUsesCredentialsEdgeType' => 'applications/transactions/edges/PhabricatorObjectUsesCredentialsEdgeType.php',
'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
'PhabricatorOneTimeTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorOneTimeTriggerClock.php',
+ 'PhabricatorOpcodeCacheSpec' => 'applications/cache/spec/PhabricatorOpcodeCacheSpec.php',
'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
'PhabricatorOwnersApplication' => 'applications/owners/application/PhabricatorOwnersApplication.php',
'PhabricatorOwnersConfigOptions' => 'applications/owners/config/PhabricatorOwnersConfigOptions.php',
@@ -4765,6 +4768,7 @@
'PhabricatorCacheManagementWorkflow' => 'PhabricatorManagementWorkflow',
'PhabricatorCacheMarkupGarbageCollector' => 'PhabricatorGarbageCollector',
'PhabricatorCacheSchemaSpec' => 'PhabricatorConfigSchemaSpec',
+ 'PhabricatorCacheSpec' => 'Phobject',
'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector',
'PhabricatorCalendarApplication' => 'PhabricatorApplication',
'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
@@ -5032,6 +5036,7 @@
'PhabricatorDashboardTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
'PhabricatorDashboardUninstallController' => 'PhabricatorDashboardController',
'PhabricatorDashboardViewController' => 'PhabricatorDashboardController',
+ 'PhabricatorDataCacheSpec' => 'PhabricatorCacheSpec',
'PhabricatorDataNotAttachedException' => 'Exception',
'PhabricatorDatabaseSetupCheck' => 'PhabricatorSetupCheck',
'PhabricatorDebugController' => 'PhabricatorController',
@@ -5464,6 +5469,7 @@
'PhabricatorObjectUsesCredentialsEdgeType' => 'PhabricatorEdgeType',
'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
'PhabricatorOneTimeTriggerClock' => 'PhabricatorTriggerClock',
+ 'PhabricatorOpcodeCacheSpec' => 'PhabricatorCacheSpec',
'PhabricatorOwnersApplication' => 'PhabricatorApplication',
'PhabricatorOwnersConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorOwnersController' => 'PhabricatorController',
diff --git a/src/applications/cache/spec/PhabricatorCacheSpec.php b/src/applications/cache/spec/PhabricatorCacheSpec.php
new file mode 100644
--- /dev/null
+++ b/src/applications/cache/spec/PhabricatorCacheSpec.php
@@ -0,0 +1,53 @@
+<?php
+
+abstract class PhabricatorCacheSpec extends Phobject {
+
+ private $name;
+ private $isEnabled = false;
+ private $version;
+ private $issues = array();
+
+ public function setName($name) {
+ $this->name = $name;
+ return $this;
+ }
+
+ public function getName() {
+ return $this->name;
+ }
+
+ public function setIsEnabled($is_enabled) {
+ $this->isEnabled = $is_enabled;
+ return $this;
+ }
+
+ public function getIsEnabled() {
+ return $this->isEnabled;
+ }
+
+ public function setVersion($version) {
+ $this->version = $version;
+ return $this;
+ }
+
+ public function getVersion() {
+ return $this->version;
+ }
+
+ protected function newIssue($title, $body, $option = null) {
+ $issue = array(
+ 'title' => $title,
+ 'body' => $body,
+ 'option' => $option,
+ );
+
+ $this->issues[] = $issue;
+
+ return $issue;
+ }
+
+ public function getIssues() {
+ return $this->issues;
+ }
+
+}
diff --git a/src/applications/cache/spec/PhabricatorDataCacheSpec.php b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
new file mode 100644
--- /dev/null
+++ b/src/applications/cache/spec/PhabricatorDataCacheSpec.php
@@ -0,0 +1,73 @@
+<?php
+
+final class PhabricatorDataCacheSpec extends PhabricatorCacheSpec {
+
+ public static function getActiveCacheSpec() {
+ $spec = new PhabricatorDataCacheSpec();
+ // NOTE: If APCu is installed, it reports that APC is installed.
+ if (extension_loaded('apc') && !extension_loaded('apcu')) {
+ return self::getAPCSpec($spec);
+ } else if (extension_loaded('apcu')) {
+ return self::getAPCuSpec($spec);
+ } else {
+ return self::getNoneSpec($spec);
+ }
+ }
+
+ private static function getAPCSpec(PhabricatorDataCacheSpec $spec) {
+ $spec
+ ->setName(pht('APC User Cache'))
+ ->setVersion(phpversion('apc'));
+
+ if (ini_get('apc.enabled')) {
+ $spec->setIsEnabled(true);
+ } else {
+ $spec->setIsEnabled(false);
+ $spec->newIssue(
+ pht('Enable APC'),
+ pht(
+ 'The "APC" extension is currently disabled. Set "apc.enabled" to '.
+ 'true to provide caching.'),
+ 'apc.enabled');
+ }
+
+ return $spec;
+ }
+
+ private static function getAPCuSpec(PhabricatorDataCacheSpec $spec) {
+ $spec
+ ->setName(pht('APCu'))
+ ->setVersion(phpversion('apcu'));
+
+ if (ini_get('apc.enabled')) {
+ $spec->setIsEnabled(true);
+ } else {
+ $spec->setIsEnabled(false);
+ $spec->newissue(
+ pht('Enable APCu'),
+ pht(
+ 'The "APCu" extension is currently disabled. Set '.
+ '"apc.enabled" to true to provide caching.'),
+ 'apc.enabled');
+ }
+
+ return $spec;
+ }
+
+ private static function getNoneSpec(PhabricatorDataCacheSpec $spec) {
+ if (version_compare(phpversion(), '5.5', '>=')) {
+ $spec->newIssue(
+ pht('Install APCu'),
+ pht(
+ 'Install the "APCu" PHP extension to provide data caching.'));
+ } else {
+ $spec->newIssue(
+ pht('Install APC'),
+ pht(
+ 'Install the "APC" PHP extension to provide data caching.'));
+ }
+
+ return $spec;
+ }
+
+}
diff --git a/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php b/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php
new file mode 100644
--- /dev/null
+++ b/src/applications/cache/spec/PhabricatorOpcodeCacheSpec.php
@@ -0,0 +1,73 @@
+<?php
+
+final class PhabricatorOpcodeCacheSpec extends PhabricatorCacheSpec {
+
+ public static function getActiveCacheSpec() {
+ $spec = new PhabricatorOpcodeCacheSpec();
+ // NOTE: If APCu is installed, it reports that APC is installed.
+ if (extension_loaded('apc') && !extension_loaded('apcu')) {
+ return self::getAPCSpec($spec);
+ } else if (extension_loaded('Zend OPcache')) {
+ return self::getOpcacheSpec($spec);
+ } else {
+ return self::getNoneSpec($spec);
+ }
+ }
+
+ private static function getAPCSpec(PhabricatorOpcodeCacheSpec $spec) {
+ $spec
+ ->setName(pht('APC'))
+ ->setVersion(phpversion('apc'));
+
+ if (ini_get('apc.enabled')) {
+ $spec->setIsEnabled(true);
+ } else {
+ $spec->setIsEnabled(false);
+ $spec->newIssue(
+ pht('Enable APC'),
+ pht(
+ 'The "APC" extension is currently disabled. Set "apc.enabled" to '.
+ 'true to improve performance.'),
+ 'apc.enabled');
+ }
+
+ return $spec;
+ }
+
+ private static function getOpcacheSpec(PhabricatorOpcodeCacheSpec $spec) {
+ $spec
+ ->setName(pht('Zend OPcache'))
+ ->setVersion(phpversion('Zend OPcache'));
+
+ if (ini_get('opcache.enable')) {
+ $spec->setIsEnabled(true);
+ } else {
+ $spec->setIsEnabled(false);
+ $spec->newissue(
+ pht('Enable Zend OPcache'),
+ pht(
+ 'The "Zend OPcache" extension is currently disabled. Set '.
+ '"opcache.enable" to true to improve performance.'),
+ 'opcache.enable');
+ }
+
+ return $spec;
+ }
+
+ private static function getNoneSpec(PhabricatorOpcodeCacheSpec $spec) {
+ if (version_compare(phpversion(), '5.5', '>=')) {
+ $spec->newIssue(
+ pht('Install OPcache'),
+ pht(
+ 'Install the "Zend OPcache" PHP extension to improve performance.'));
+ } else {
+ $spec->newIssue(
+ pht('Install APC'),
+ pht(
+ 'Install the "APC" PHP extension to improve performance.'));
+ }
+
+ return $spec;
+ }
+
+}
diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php
--- a/src/applications/config/controller/PhabricatorConfigCacheController.php
+++ b/src/applications/config/controller/PhabricatorConfigCacheController.php
@@ -15,23 +15,15 @@
->buildApplicationCrumbs()
->addTextCrumb(pht('Cache Status'));
- $nav->setCrumbs($crumbs);
+ $code_box = $this->renderCodeBox();
+ $data_box = $this->renderDataBox();
- list($remedy, $properties) = $this->getProperties();
-
- $property_list = id(new PHUIPropertyListView());
- foreach ($properties as $property) {
- list($name, $value) = $property;
- $property_list->addProperty($name, $value);
- }
-
-
- $box = id(new PHUIObjectBoxView())
- ->setFormErrors($remedy)
- ->setHeaderText(pht('Cache'))
- ->addPropertyList($property_list);
-
- $nav->appendChild($box);
+ $nav->appendChild(
+ array(
+ $crumbs,
+ $code_box,
+ $data_box,
+ ));
return $this->buildApplicationPage(
$nav,
@@ -40,109 +32,67 @@
));
}
- private function getProperties() {
- $remedy = array();
-
- $properties = array();
-
- // NOTE: If APCu is installed, it reports that APC is installed.
- if (extension_loaded('apc') && !extension_loaded('apcu')) {
- $cache_installed = true;
- $cache_name = pht('APC');
- $cache_version = phpversion('apc');
- $cache_enabled = (bool)ini_get('apc.enabled');
- if (!$cache_enabled) {
- $remedy[] = pht('Enable APC');
- }
- $datacache_installed = true;
- $datacache_name = pht('APC User Cache');
- $datacache_version = phpversion('apc');
- $datacache_enabled = true;
- } else {
- if (extension_loaded('Zend OPcache')) {
- $cache_installed = true;
- $cache_name = pht('Zend Opcache');
- $cache_enabled = (bool)ini_get('opcache.enable');
- $cache_version = phpversion('Zend OPcache');
- if (!$cache_enabled) {
- $remedy[] = pht('Enable Opcache.');
- }
- } else {
- if (version_compare(phpversion(), '5.5', '>=')) {
- $remedy[] = pht('Install OPcache.');
- } else {
- $remedy[] = pht('Install APC.');
- }
-
- $cache_installed = false;
- $cache_name = pht('None');
- $cache_enabled = false;
- $cache_version = null;
- }
-
- if (extension_loaded('apcu')) {
- $datacache_installed = true;
- $datacache_name = pht('APCu');
- $datacache_version = phpversion('apcu');
- $datacache_enabled = (bool)ini_get('apc.enabled');
- } else {
- if (version_compare(phpversion(), '5.5', '>=')) {
- $remedy[] = pht('Install APCu.');
- } else {
- // We already suggested installing APC above.
- }
-
- $datacache_installed = false;
- $datacache_name = pht('None');
- $datacache_version = null;
- $datacache_enabled = false;
- }
- }
+ private function renderCodeBox() {
+ $cache = PhabricatorOpcodeCacheSpec::getActiveCacheSpec();
- if ($cache_installed) {
- $cache_property = $this->renderYes($cache_name);
- } else {
- $cache_property = $this->renderNo($cache_name);
- }
+ $properties = id(new PHUIPropertyListView());
- if ($cache_enabled) {
- $cache_enabled_property = $this->renderYes(pht('Enabled'));
- } else {
- $cache_enabled_property = $this->renderNo(pht('Not Enabled'));
- }
+ $this->renderCommonProperties($properties, $cache);
- $properties[] = array(pht('Opcode Cache'), $cache_property);
- $properties[] = array(pht('Enabled'), $cache_enabled_property);
- if ($cache_version) {
- $properties[] = array(
- pht('Version'),
- $this->renderInfo($cache_version),
- );
- }
+ return id(new PHUIObjectBoxView())
+ ->setFormErrors($this->renderIssues($cache->getIssues()))
+ ->setHeaderText(pht('Opcode Cache'))
+ ->addPropertyList($properties);
+ }
+
+ private function renderDataBox() {
+ $cache = PhabricatorDataCacheSpec::getActiveCacheSpec();
+
+ $properties = id(new PHUIPropertyListView());
+
+ $this->renderCommonProperties($properties, $cache);
+
+ return id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Data Cache'))
+ ->addPropertyList($properties);
+ }
- if ($datacache_installed) {
- $datacache_property = $this->renderYes($datacache_name);
+ private function renderCommonProperties(
+ PHUIPropertyListView $properties,
+ PhabricatorCacheSpec $cache) {
+
+ if ($cache->getName() !== null) {
+ $name = $this->renderYes($cache->getName());
} else {
- $datacache_property = $this->renderNo($datacache_name);
+ $name = $this->renderNo(pht('None'));
}
+ $properties->addProperty(pht('Cache'), $name);
- if ($datacache_enabled) {
- $datacache_enabled_property = $this->renderYes(pht('Enabled'));
+ if ($cache->getIsEnabled()) {
+ $enabled = $this->renderYes(pht('Enabled'));
} else {
- $datacache_enabled_property = $this->renderNo(pht('Not Enabled'));
+ $enabled = $this->renderNo(pht('Not Enabled'));
}
+ $properties->addProperty(pht('Enabled'), $enabled);
- $properties[] = array(pht('Data Cache'), $datacache_property);
- $properties[] = array(pht('Enabled'), $datacache_enabled_property);
- if ($datacache_version) {
- $properties[] = array(
- pht('Version'),
- $this->renderInfo($datacache_version),
- );
+ $version = $cache->getVersion();
+ if ($version) {
+ $properties->addProperty(pht('Version'), $this->renderInfo($version));
}
+ }
-
- return array($remedy, $properties);
+ private function renderIssues(array $issues) {
+ $result = array();
+ foreach ($issues as $issue) {
+ $title = $issue['title'];
+ $body = $issue['body'];
+ $result[] = array(
+ phutil_tag('strong', array(), $title.':'),
+ ' ',
+ $body,
+ );
+ }
+ return $result;
}
private function renderYes($info) {

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 31, 3:03 PM (5 d, 2 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7707975
Default Alt Text
D12315.diff (15 KB)

Event Timeline

Phabricator · Built by Phacility