Skip to content

Remove wrong entry in admin_settings that causes 500 - #7230

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-autoload-section-failure
Nov 20, 2017
Merged

Remove wrong entry in admin_settings that causes 500#7230
MorrisJobke merged 1 commit into
masterfrom
fix-autoload-section-failure

Conversation

@MorrisJobke

@MorrisJobkeMorrisJobke commented Nov 20, 2017

Copy link
Copy Markdown
Member
  • having a stale entry like this in the oc_admin_settings table:
INSERT INTO oc_admin_settings(class, section, priority)
VALUES ('OCA\\OnlyOffice\\AdminSettings', 'server', 1);
  • also have the only office app code in your apps directory but disable the app
  • open the admin settings
  • actual: 500 internal server error like in Nexcloud 11 upgrade to 12 workaround #5313
  • expected: load the admin settings

This PR cleans up those stale entries and avoids the 500.

Should we maybe backport this to 12?

Fixes#5313
Fixes#5067

// skip
} catch (AutoloadNotAllowedException $e) {
// skip error and remove remnant of disabled app
$this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, $row['class']);

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Please log this so we have a trace that it happened.

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Done

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke
MorrisJobkeforce-pushed the fix-autoload-section-failure branch from cdf3fce to 6fd5142CompareNovember 20, 2017 19:49
@codecov

codecovBot commented Nov 20, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7230 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7230 +/- ##
============================================
- Coverage 50.84% 50.84% -0.01% - Complexity 24547 24548 +1 
============================================
Files 1585 1585 Lines 93801 93804 +3 Branches 1354 1354 ============================================
Hits 47697 47697 - Misses 46104 46107 +3
Impacted FilesCoverage ΔComplexity Δ
lib/private/Settings/Manager.php44.44% <0%> (-0.52%)81 <0> (+1)

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 20, 2017
@MorrisJobke
MorrisJobke merged commit fe3f094 into masterNov 20, 2017
@MorrisJobke
MorrisJobke deleted the fix-autoload-section-failure branch November 20, 2017 21:14
@rullzer

Copy link
Copy Markdown
Member

Backport in #7455

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishfeature: settings

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@MorrisJobke@rullzer@icewind1991