Skip to content
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.

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

feat: configurable request timeout for carddav sync #48418

Merged
merged 2 commits into from
Oct 18, 2024

Conversation

pabzm
Copy link
Contributor

@pabzm pabzm commented Sep 27, 2024

Big federated setups may need a longer timeout, which they now can configure.

This is motivated by a debugging session, in which we had to raise the timeout but could do so only via a patch.

The default timeout length doesn't change with this PR.

Checklist

config/config.sample.php Outdated Show resolved Hide resolved
apps/dav/lib/CardDAV/SyncService.php Outdated Show resolved Hide resolved
@joshtrichards joshtrichards added the feature: carddav Related to CardDAV internals label Sep 27, 2024
@kesselb kesselb added this to the Nextcloud 31 milestone Sep 30, 2024
@pabzm pabzm force-pushed the config-carddav-sync-request-timeout branch from d3bd669 to 7b1d30c Compare October 2, 2024 13:54
tcitworld added a commit that referenced this pull request Oct 10, 2024
… instead of magic number 30

Will be used to set default where we are able to override the default timeout.

See #48418

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
tcitworld added a commit that referenced this pull request Oct 11, 2024
… instead of magic number 30

Will be used to set default where we are able to override the default timeout.

See #48418

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
apps/dav/lib/CardDAV/SyncService.php Outdated Show resolved Hide resolved
@tcitworld tcitworld dismissed their stale review October 11, 2024 11:22

because backports

Copy link
Contributor

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

Copy link
Contributor

@miaulalala miaulalala left a comment

Choose a reason for hiding this comment

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

1) OCA\DAV\Tests\unit\CardDAV\SyncServiceTest::testEmptySync
ArgumentCountError: Too few arguments to function OCA\DAV\CardDAV\SyncService::__construct(), 6 passed in /home/runner/work/server/server/apps/dav/tests/unit/CardDAV/SyncServiceTest.php on line 62 and exactly 7 expected

lmk if you need help with the tests

@pabzm pabzm force-pushed the config-carddav-sync-request-timeout branch 2 times, most recently from de47a76 to 69a28ca Compare October 15, 2024 07:39
pabzm and others added 2 commits October 17, 2024 22:27
Big federated setups may need a longer timeout, which they now can
configure.

Signed-off-by: Pablo Zmdl <pablo@nextcloud.com>
Co-authored-by: Josh <josh.t.richards@gmail.com>
Co-authored-by: Thomas Citharel <nextcloud@tcit.fr>
Signed-off-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com>
@kesselb kesselb force-pushed the config-carddav-sync-request-timeout branch from 69a28ca to 742764b Compare October 17, 2024 20:27
@kesselb kesselb added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 17, 2024
@ChristophWurst ChristophWurst merged commit 0c67541 into master Oct 18, 2024
177 checks passed
@ChristophWurst ChristophWurst deleted the config-carddav-sync-request-timeout branch October 18, 2024 07:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement feature: carddav Related to CardDAV internals feedback-requested
Projects
Status: ☑️ Done
Development

Successfully merging this pull request may close these issues.

7 participants