Skip to content

Cache result of check upgrade #18945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
individual-it wants to merge 3 commits into from
Closed

Cache result of check upgrade #18945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4524ed
cache result of checkUpgrade() in self::$needUpgrade
individual-it Sep 10, 2015
ffb16af
reduce calls of \OCP\Util::needUpgrade()
individual-it Sep 10, 2015
9eaf67b
move caching to \OCP\Util::needUpgrade
individual-it Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ public static function checkConfig() {
// Check if config is writable
$configFileWritable = is_writable($configFilePath);
if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
|| !$configFileWritable && \OCP\Util::needUpgrade()) {
|| !$configFileWritable && self::checkUpgrade(false)) {
Copy link
Contributor

@PVince81 PVince81 Sep 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checkUpgrade would display an upgrade page, might be better to call needUpgrade() instead in most cases instead of the other way around ?

Actually checkUpgrade should be called only once to display the page if needed

Copy link
Member Author

@individual-it individual-it Sep 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

checkUpgrade has the $showTemplate switch
Just tried to be consequent in the file and not mix needUpgrade() and checkUpgrade()

Copy link
Contributor

@PVince81 PVince81 Sep 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I misread the code in checkUpgrade, should be safe.

if (self::$CLI) {
echo $l->t('Cannot write into "config" directory!')."\n";
echo $l->t('This can usually be fixed by giving the webserver write access to the config directory')."\n";
Expand Down Expand Up @@ -741,7 +741,7 @@ private static function registerLocalAddressBook() {
*/
public static function registerCacheHooks() {
//don't try to do this before we are properly setup
if (\OC::$server->getSystemConfig()->getValue('installed', false) && !\OCP\Util::needUpgrade()) {
if (\OC::$server->getSystemConfig()->getValue('installed', false) && !self::checkUpgrade(false)) {

// NOTE: This will be replaced to use OCP
$userSession = self::$server->getUserSession();
Expand Down Expand Up @@ -777,7 +777,7 @@ private static function registerEncryptionHooks() {
*/
public static function registerLogRotate() {
$systemConfig = \OC::$server->getSystemConfig();
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
\OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/owncloud.log'));
Expand Down Expand Up @@ -869,8 +869,7 @@ public static function handleRequest() {

// Load minimum set of apps
if (!self::checkUpgrade(false)
&& !$systemConfig->getValue('maintenance', false)
&& !\OCP\Util::needUpgrade()) {
&& !$systemConfig->getValue('maintenance', false)) {
// For logged-in users: Load everything
if(OC_User::isLoggedIn()) {
OC_App::loadApps();
Expand All @@ -883,7 +882,7 @@ public static function handleRequest() {

if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
try {
if (!$systemConfig->getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
if (!$systemConfig->getValue('maintenance', false) && !self::checkUpgrade(false)) {
OC_App::loadApps(array('filesystem', 'logging'));
OC_App::loadApps();
}
Expand Down
6 changes: 5 additions & 1 deletion lib/public/util.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ public static function isDefaultExpireDateEnforced() {
return \OC_Util::isDefaultExpireDateEnforced();
}

protected static $needUpgrade = null;

/**
* Checks whether the current version needs upgrade.
Expand All @@ -669,6 +670,9 @@ public static function isDefaultExpireDateEnforced() {
* @since 7.0.0
*/
public static function needUpgrade() {
return \OC_Util::needUpgrade(\OC::$server->getConfig());
if (!isset(self::$needUpgrade)) {
self::$needUpgrade=\OC_Util::needUpgrade(\OC::$server->getConfig());
}
return self::$needUpgrade;
}
}