Skip to content

Whats pro #7

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
jrrcdev merged 5 commits into from
Apr 4, 2020
Merged

Whats pro #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7887542
increase elksyncer bulk size
Apr 4, 2020
e62b58f
added mongo connector docker volume
Apr 4, 2020
e408dce
fix issue when no file type is specified
jrrcdev Apr 4, 2020
67a0679
Merge pull request #5 from Loop3/noFileTypeIssue
jrrcdev Apr 4, 2020
d9b662d
Merge pull request #6 from Loop3/develop
jrrcdev Apr 4, 2020
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
7 changes: 5 additions & 2 deletions elkSyncer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ RUN pip install mongo-connector==3.1.1 \
&& pip install elastic2-doc-manager==1.0.0 \
&& pip install python-dotenv==0.11.0

COPY . .
RUN mkdir /var/log/mongo-connector

CMD ["python", "main.py"]
COPY mongo-connector-config.json .
COPY main.py .

CMD ["python", "main.py"]
4 changes: 2 additions & 2 deletions elkSyncer/mongo-connector-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"oplogFile": "oplog.timestamp",
"oplogFile": "/var/log/mongo-connector/oplog.timestamp",
"noDump": false,
"batchSize": 50,
"batchSize": 5000,
"verbosity": 3,
"continueOnError": true,
"logging": {
Expand Down
12 changes: 1 addition & 11 deletions src/data/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,11 @@ export const checkFile = async (file, source?: string) => {
return 'Invalid file type';
}

const defaultMimeTypes = [
'image/png',
'image/jpeg',
'image/jpg',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
'application/pdf',
'image/gif',
];

const UPLOAD_FILE_TYPES = await getConfig(source === 'widgets' ? 'WIDGETS_UPLOAD_FILE_TYPES' : 'UPLOAD_FILE_TYPES');

const { mime } = ft;

if (!((UPLOAD_FILE_TYPES && UPLOAD_FILE_TYPES.split(',')) || defaultMimeTypes).includes(mime)) {
if (UPLOAD_FILE_TYPES && !UPLOAD_FILE_TYPES.split(',').includes(mime)) {
return 'Invalid configured file type';
}

Expand Down