-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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
[Reporting/New Platform] Use the logger service from core #55442
Merged
tsullivan
merged 9 commits into
elastic:master
from
tsullivan:reporting/np-server-logger
Jan 23, 2020
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
640264f
More Typescript Fixes
tsullivan 0e75d64
[Reporting/New Platform] Use the logger service from core
tsullivan 77f91bf
Add log tag
tsullivan 94ebeeb
fix jest tests
tsullivan c4b807e
ts fixes
tsullivan cb7b1d1
Merge branch 'master' into reporting/np-server-logger
tsullivan 393f962
fix mocha test
tsullivan 9119c9f
convert to jest
tsullivan 0fc86d4
Merge branch 'master' into reporting/np-server-logger
tsullivan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
263 changes: 139 additions & 124 deletions
263
...types/csv/server/__tests__/execute_job.js → ...port_types/csv/server/execute_job.test.js
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,25 +5,26 @@ | |
*/ | ||
|
||
import { i18n } from '@kbn/i18n'; | ||
import { CSV_JOB_TYPE } from '../../../common/constants'; | ||
import { cryptoFactory } from '../../../server/lib'; | ||
import { | ||
ExecuteJobFactory, | ||
ESQueueWorkerExecuteFn, | ||
ExecuteJobFactory, | ||
FieldFormats, | ||
Logger, | ||
ServerFacade, | ||
} from '../../../types'; | ||
import { CSV_JOB_TYPE, PLUGIN_ID } from '../../../common/constants'; | ||
import { cryptoFactory, LevelLogger } from '../../../server/lib'; | ||
import { JobDocPayloadDiscoverCsv } from '../types'; | ||
import { createGenerateCsv } from './lib/generate_csv'; | ||
import { fieldFormatMapFactory } from './lib/field_format_map'; | ||
import { createGenerateCsv } from './lib/generate_csv'; | ||
|
||
export const executeJobFactory: ExecuteJobFactory<ESQueueWorkerExecuteFn< | ||
JobDocPayloadDiscoverCsv | ||
>> = function executeJobFactoryFn(server: ServerFacade) { | ||
>> = function executeJobFactoryFn(server: ServerFacade, parentLogger: Logger) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Man the |
||
const { callWithRequest } = server.plugins.elasticsearch.getCluster('data'); | ||
const crypto = cryptoFactory(server); | ||
const config = server.config(); | ||
const logger = LevelLogger.createForServer(server, [PLUGIN_ID, CSV_JOB_TYPE, 'execute-job']); | ||
const logger = parentLogger.clone([CSV_JOB_TYPE, 'execute-job']); | ||
const serverBasePath = config.get('server.basePath'); | ||
|
||
return async function executeJob( | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Apologies, but this PR contains some automated changes of an IDE tool that organize the imports