start/stop subscription mgmt

elastic · Nov 24, 2020 · e7836e1 · e7836e1
1 parent 8036309
commit e7836e1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
@@ -3,6 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+import { Subscription } from 'rxjs';
+
 import {
   KibanaRequest,
   Logger,
@@ -21,7 +24,8 @@ import { licenseService } from '../../../lib/license/license';
 export class PolicyWatcher {
   private logger: Logger;
   private soClient: SavedObjectsClientContract;
-  private policyService?: PackagePolicyServiceInterface;
+  private policyService: PackagePolicyServiceInterface;
+  private subscription: Subscription | undefined;
   constructor(
     policyService: PackagePolicyServiceInterface,
     soStart: SavedObjectsServiceStart,
@@ -44,6 +48,16 @@ export class PolicyWatcher {
     return soStart.getScopedClient(fakeRequest, { excludedWrappers: ['security'] });
   }
 
+  public start() {
+    this.subscription = licenseService.getLicenseInformation$()?.subscribe(this.watch.bind(this));
+  }
+
+  public stop() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
+  }
+
   public async watch(license: ILicense) {
     let packagePolicies: PackagePolicy[];
     if (!this.policyService) {

diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Observable } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
 import LRU from 'lru-cache';
@@ -128,6 +128,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
   private lists: ListPluginSetup | undefined; // TODO: can we create ListPluginStart?
   private licensing$!: Observable<ILicense>;
+  private policyWatcher: PolicyWatcher;
 
   private manifestTask: ManifestTask | undefined;
   private exceptionsCache: LRU<string, Buffer>;
@@ -371,16 +372,20 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     this.telemetryEventsSender.start(core, plugins.telemetry);
     this.licensing$ = plugins.licensing.license$;
     licenseService.start(this.licensing$);
-    const policyWatcher = new PolicyWatcher(plugins.fleet?.packagePolicyService);
-    licenseService.getLicenseInformation$()?.subscribe(policyWatcher.watch);
-
+    this.policyWatcher = new PolicyWatcher(
+      plugins.fleet!.packagePolicyService,
+      core.savedObjects,
+      this.logger
+    );
+    this.policyWatcher.start();
     return {};
   }
 
   public stop() {
     this.logger.debug('Stopping plugin');
     this.telemetryEventsSender.stop();
     this.endpointAppContextService.stop();
+    this.policyWatcher.stop();
     licenseService.stop();
   }
 }