Skip to content

Implement collaborative locking #2248

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

Merged
juliusknorr merged 8 commits into from
Apr 21, 2022
Merged

Implement collaborative locking #2248

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8c00c8e
Implement collaborative locking
juliusknorr Mar 23, 2022
53d1012
Open files read only if locked
juliusknorr Apr 21, 2022
5c9225e
Expose lock in the text UI
juliusknorr Apr 21, 2022
fa139cf
Also take mtime into account for change detection during editing
juliusknorr Apr 21, 2022
ede33b5
Unlock during session cleanup
juliusknorr Apr 21, 2022
ff819af
Make psalm happy
juliusknorr Apr 21, 2022
de93bce
Use proper file id source for public shares
juliusknorr Apr 21, 2022
42a7882
Bump bundles
juliusknorr Apr 21, 2022
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
Prev Previous commit
Next Next commit
Unlock during session cleanup 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Apr 21, 2022
commit ede33b50d4269b425521ff2d4669c13d7be58874
2 changes: 2 additions & 0 deletions lib/Cron/Cleanup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ protected function run($argument) {
continue;
}

$this->documentService->unlock($session->getDocumentId());

try {
$this->logger->debug('Resetting document ' . $session->getDocumentId() . '');
$this->documentService->resetDocument($session->getDocumentId());
Expand Down