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.

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

enh: db schema change #79

Merged
merged 14 commits into from
Dec 13, 2024
Merged

enh: db schema change #79

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9a9dba1
enh: db schema change
kyteinsky Dec 9, 2024
8b85859
add updateAccessProvider to ContentManager
kyteinsky Dec 9, 2024
82ba144
add action job again on exceptions
kyteinsky Dec 9, 2024
6a5ba61
network: only throw on 5xx errors
kyteinsky Dec 9, 2024
0147d11
fix action service deleteSources json payload
kyteinsky Dec 9, 2024
bb7907d
rename migration to be the latest version
kyteinsky Dec 9, 2024
ea77218
paper cuts
kyteinsky Dec 10, 2024
5fc3cab
fix allow files in NodeWrittenEvent
kyteinsky Dec 11, 2024
89a2df2
fix: do not index files_versions|files_trashbin files
kyteinsky Dec 11, 2024
a785c28
remove username and 'files' from source title
kyteinsky Dec 12, 2024
649a6bf
address review comments
kyteinsky Dec 12, 2024
e04be83
update share listener logic
kyteinsky Dec 12, 2024
42f774a
add locked files to the end of the index queue
kyteinsky Dec 12, 2024
e5b7b89
fix remnants from expts
kyteinsky Dec 12, 2024
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: 10 additions & 1 deletion lib/BackgroundJobs/IndexerJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ protected function index(array $files): void {
$sources = [];
$allSourceIds = [];
$loadedSources = [];
$retryQFiles = [];
$size = 0;

foreach ($files as $queueFile) {
Expand All @@ -161,9 +162,13 @@ protected function index(array $files): void {
try {
try {
$fileHandle = $file->fopen('r');
} catch (LockedException|NotPermittedException $e) {
} catch (NotPermittedException $e) {
$this->logger->error('Could not open file ' . $file->getPath() . ' for reading', ['exception' => $e]);
continue;
} catch (LockedException $e) {
$retryQFiles[] = $queueFile;
$this->logger->info('File ' . $file->getPath() . ' is locked, could not read for indexing. Adding it to the next batch.');
Copy link
Member

Choose a reason for hiding this comment

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

Smart!

continue;
}
if (!is_resource($fileHandle)) {
$this->logger->warning('File handle for' . $file->getPath() . ' is not readable');
Expand Down Expand Up @@ -197,6 +202,10 @@ protected function index(array $files): void {

try {
$this->queue->removeFromQueue($files);
// add files that were locked to the end of the queue
foreach ($retryQFiles as $queueFile) {
$this->queue->insertIntoQueue($queueFile);
}
} catch (Exception $e) {
$this->logger->error('Could not remove indexed files from queue', ['exception' => $e]);
}
Expand Down
Loading