Skip to content

Commit 13de8db

Browse files
Merge pull request #40 from Flowpack/task/remove-beanstalkd-config
!!! TASK: Remove beanstalkD config
2 parents e033102 + 6874205 commit 13de8db

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

Configuration/Settings.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,15 @@ Flowpack:
1313
cleanupIndicesAfterSuccessfulSwitch: true
1414
JobQueue:
1515
Common:
16-
presets:
17-
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
18-
className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
19-
executeIsolated: true
20-
options:
21-
client:
22-
host: '127.0.0.1'
23-
port: 11300
24-
2516
queues:
2617
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
2718
preset: 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer'
2819

2920
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
3021
preset: 'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer'
22+
23+
presets:
24+
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
25+
className: 'Flowpack\JobQueue\Common\Queue\FakeQueue'
26+
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
27+
className: 'Flowpack\JobQueue\Common\Queue\FakeQueue'

README.md

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
# Neos CMS Elasticsearch indexer based on a job queue
22

3+
[![Latest Stable Version](https://poser.pugx.org/flowpack/elasticsearch-contentRepositoryQueueIndexer/v/stable)](https://packagist.org/packages/flowpack/elasticsearch-contentRepositoryQueueIndexer) [![Total Downloads](https://poser.pugx.org/flowpack/elasticsearch-contentRepositoryQueueIndexer/downloads)](https://packagist.org/packages/flowpack/elasticsearch-contentRepositoryQueueIndexer)
4+
35
This package can be used to index a huge amount of nodes in Elasticsearch indexes. This
46
package use the Flowpack JobQueue packages to handle the indexing asynchronously.
57

6-
# Breaking change after an upgrade to 3.0
8+
**Topics**
9+
10+
* [Installation](#installation-and-configuration)
11+
* [Indexing](#indexing)
12+
* [SupervisorD configuration](#supervisord-configuration)
13+
* [Update Instructions](#update-instructions)
714

8-
Previously the Beanstalk queue package was installed by default, this is no longer
9-
the case.
1015

11-
# Install and configure your Queue package
16+
# Installation and Configuration
1217

1318
You need to install the correct Queue package based on your needs.
1419

@@ -21,28 +26,25 @@ Available packages:
2126

2227
Please check the package documentation for specific configurations.
2328

24-
The default configuration uses Beanstalkd, but you need to install it manually:
25-
26-
composer require flowpack/jobqueue-beanstalkd
29+
The default configuration uses the FakeQueue, which is provided by the JobQueue.Common package. Note that with that package jobs are executed synchronous with the `flow nodeindexqueue:build` command.
2730

2831
Check the ```Settings.yaml``` to adapt based on the Queue package, you need to adapt the ```className```:
2932

3033
Flowpack:
3134
JobQueue:
3235
Common:
33-
queues:
36+
presets:
3437
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
35-
className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
36-
38+
className: 'Flowpack\JobQueue\Common\Queue\FakeQueue'
3739
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer.Live':
38-
className: 'Flowpack\JobQueue\Beanstalkd\Queue\BeanstalkdQueue'
40+
className: 'Flowpack\JobQueue\Common\Queue\FakeQueue'
3941

4042
If you use the [doctrine](https://packagist.org/packages/flownative/jobqueue-doctrine) package you have to set the ```tableName``` manually:
4143

4244
Flowpack:
4345
JobQueue:
4446
Common:
45-
queues:
47+
presets:
4648
'Flowpack.ElasticSearch.ContentRepositoryQueueIndexer':
4749
className: 'Flowpack\JobQueue\Doctrine\Queue\DoctrineQueue'
4850
options:
@@ -53,19 +55,21 @@ If you use the [doctrine](https://packagist.org/packages/flownative/jobqueue-doc
5355
options:
5456
tableName: 'flowpack_jobqueue_QueueIndexerLive'
5557

56-
# Batch Indexing
58+
# Indexing
5759

58-
## How to build indexing job
60+
## Batch Indexing
61+
62+
### How to build indexing jobs
5963

6064
flow nodeindexqueue:build --workspace live
6165

62-
## How to process indexing job
66+
#### How to process indexing jobs
6367

6468
You can use this CLI command to process indexing job:
6569

6670
flow nodeindexqueue:work --queue batch
6771

68-
# Live Indexing
72+
## Live Indexing
6973

7074
You can disable async live indexing by editing ```Settings.yaml```:
7175

@@ -108,13 +112,16 @@ You can use tools like ```supervisord``` to manage long running processes. Bello
108112
autorestart=true
109113
stopsignal=QUIT
110114

111-
Acknowledgments
112-
---------------
115+
# Update Instructions
116+
117+
## Breaking change after an upgrade to 3.0
118+
119+
* Previously the Beanstalk queue package was installed by default, this is no longer
120+
the case.
113121

114-
Development sponsored by [ttree ltd - neos solution provider](http://ttree.ch).
122+
## Breaking change after an upgrade to 5.0
115123

116-
We try our best to craft this package with a lots of love, we are open to
117-
sponsoring, support request, ... just contact us.
124+
* The beanstalk queue configuration is removed. The FakeQueue is used if not configured to another queuing package.
118125

119126
License
120127
-------

0 commit comments

Comments
 (0)