cleanup

elastic · May 9, 2019 · 1345904 · 1345904
1 parent 2a01ed7
commit 1345904
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts
@@ -20,7 +20,7 @@
 import { readdir, stat } from 'fs';
 import { resolve } from 'path';
 import { bindNodeCallback, from, merge } from 'rxjs';
-import { catchError, filter, mergeMap, shareReplay } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, shareReplay } from 'rxjs/operators';
 import { CoreContext } from '../../core_context';
 import { Logger } from '../../logging';
 import { PluginWrapper } from '../plugin';
@@ -115,9 +115,8 @@ function processPluginSearchPaths$(pluginDirs: ReadonlyArray<string>, log: Logge
  */
 function createPlugin$(path: string, log: Logger, coreContext: CoreContext) {
   return from(parseManifest(path, coreContext.env.packageInfo)).pipe(
-    mergeMap(async manifest => {
+    map(manifest => {
       log.debug(`Successfully discovered plugin "${manifest.id}" at "${path}"`);
-
       return new PluginWrapper(
         path,
         manifest,

diff --git a/src/core/server/plugins/index.ts b/src/core/server/plugins/index.ts
@@ -20,7 +20,7 @@
 export { PluginsService, PluginsServiceSetup, PluginsServiceStart } from './plugins_service';
 export { config } from './plugins_config';
 /** @internal */
-export { isNewPlatformPlugin, discover } from './discovery';
+export { isNewPlatformPlugin } from './discovery';
 /** @internal */
 export {
   DiscoveredPlugin,