From f71a6ad51ec0de8fb6ccda785d61fd7fdb971b74 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Wed, 17 Jun 2020 15:06:19 +0300
Subject: [PATCH 1/2] fix(basic-connection-plugin): preload DBSources

---
 .../src/BasicConnectionPluginBootstrap.ts                  | 6 ++++--
 webapp/packages/basic-connection-plugin/src/manifest.ts    | 7 -------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts b/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
index 8ef3e89b8b..d705f48115 100644
--- a/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
+++ b/webapp/packages/basic-connection-plugin/src/BasicConnectionPluginBootstrap.ts
@@ -7,7 +7,7 @@
  */
 
 import { MainMenuService, ConnectionDialogsService } from '@dbeaver/core/app';
-import { injectable } from '@dbeaver/core/di';
+import { injectable, Bootstrap } from '@dbeaver/core/di';
 import { CommonDialogService } from '@dbeaver/core/dialogs';
 import { NotificationService } from '@dbeaver/core/eventsLog';
 import { PermissionsService, EPermission, SessionService } from '@dbeaver/core/root';
@@ -16,7 +16,7 @@ import { BasicConnectionService } from './BasicConnectionService';
 import { ConnectionDialog } from './ConnectionDialog/ConnectionDialog';
 
 @injectable()
-export class BasicConnectionPluginBootstrap {
+export class BasicConnectionPluginBootstrap extends Bootstrap {
 
   constructor(
     private connectionDialogsService: ConnectionDialogsService,
@@ -27,9 +27,11 @@ export class BasicConnectionPluginBootstrap {
     private permissionsService: PermissionsService,
     private sessionService: SessionService
   ) {
+    super();
   }
 
   bootstrap() {
+    this.loadDbSources();
     this.sessionService.onUpdate.subscribe(this.loadDbSources.bind(this));
     this.mainMenuService.registerMenuItem(
       this.connectionDialogsService.newConnectionMenuToken,
diff --git a/webapp/packages/basic-connection-plugin/src/manifest.ts b/webapp/packages/basic-connection-plugin/src/manifest.ts
index 8a41c4f742..28e34227b7 100644
--- a/webapp/packages/basic-connection-plugin/src/manifest.ts
+++ b/webapp/packages/basic-connection-plugin/src/manifest.ts
@@ -8,7 +8,6 @@
 
 import { PluginManifest } from '@dbeaver/core/di';
 
-import { BasicConnectionPluginBootstrap } from './BasicConnectionPluginBootstrap';
 import { BasicConnectionService } from './BasicConnectionService';
 
 export const basicConnectionPluginManifest: PluginManifest = {
@@ -19,10 +18,4 @@ export const basicConnectionPluginManifest: PluginManifest = {
   providers: [
     BasicConnectionService,
   ],
-
-  initialize(services): void {
-    services
-      .resolveServiceByClass(BasicConnectionPluginBootstrap)
-      .bootstrap();
-  },
 };

From 78b726fc8c4dd5df485feefd013129f01fe611b1 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 17 Jun 2020 15:07:07 +0300
Subject: [PATCH 2/2] Supervisor config

---
 deploy/supervisor/cloudbeaver.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deploy/supervisor/cloudbeaver.conf b/deploy/supervisor/cloudbeaver.conf
index b0aa0e5f20..222c440a1e 100644
--- a/deploy/supervisor/cloudbeaver.conf
+++ b/deploy/supervisor/cloudbeaver.conf
@@ -1,6 +1,7 @@
 [program:cloudbeaver_demo]
 directory=/opt/cloudbeaver/deploy/cloudbeaver/
 command=/opt/cloudbeaver/deploy/cloudbeaver/run-server.sh
+stopasgroup=true
 autostart=true
 autorestart=true
 redirect_stderr=true