Skip to content

[stable13] do not catch and ignore ServerNotAvailable in the wrong spot #8073

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

Jump to bottom
Merged
MorrisJobke merged 1 commit into from
Jan 31, 2018
Merged

[stable13] do not catch and ignore ServerNotAvailable in the wrong spot #8073

MorrisJobke merged 1 commit into from
Jan 31, 2018

Conversation

@blizzz
Copy link
Member

@blizzz blizzz commented Jan 26, 2018

backport of #8069

@blizzz
do not catch ServerNotAvailable
d61dd36 
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz blizzz added this to the Nextcloud 13.0.1 milestone Jan 26, 2018
@blizzz blizzz requested review from MorrisJobke and rullzer January 26, 2018 14:37
@codecov
Copy link

codecov bot commented Jan 26, 2018 •
edited
Loading

Codecov Report

Merging #8073 into stable13 will decrease coverage by <.01%.
The diff coverage is 50%.

@@              Coverage Diff               @@
##             stable13    #8073      +/-   ##
==============================================
- Coverage       51.23%   51.23%   -0.01%     
- Complexity      24981    24982       +1     
==============================================
  Files            1607     1607              
  Lines           95049    95051       +2     
  Branches         1376     1376              
==============================================
+ Hits            48696    48697       +1     
- Misses          46353    46354       +1
Impacted Files Coverage Δ Complexity Δ
apps/user_ldap/lib/Access.php 35.61% <ø> (ø) 316 <0> (ø) ⬇️
apps/user_ldap/lib/User_LDAP.php 76.49% <50%> (-0.58%) 84 <0> (+1)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
core/js/js.js 66.4% <0%> (+0.11%) 0% <0%> (ø) ⬇️
lib/private/Server.php 81.55% <0%> (+0.11%) 134% <0%> (ø) ⬇️

MorrisJobke
MorrisJobke approved these changes Jan 27, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

⚠️ But wait until 13.0.0 is out ⚠️

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 27, 2018
@MorrisJobke MorrisJobke merged commit bb7a2b2 into stable13 Jan 31, 2018
@MorrisJobke MorrisJobke deleted the stable13-8069 branch January 31, 2018 13:46
@MorrisJobke MorrisJobke mentioned this pull request Jan 31, 2018
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzer rullzer rullzer approved these changes

@MorrisJobke MorrisJobke MorrisJobke approved these changes

Assignees

No one assigned

Labels

4. to release Ready to be released and/or waiting for tests to finish bug feature: ldap

Projects

None yet

Milestone

Nextcloud 13

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz @rullzer @MorrisJobke