DO: create ext after reset schema

VikingMedicDad · Apr 15, 2021 · 476d462 · 476d462
1 parent 8094b5f
commit 476d462
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/deploy/digitalocean-marketplace/files/var/lib/cloud/scripts/per-instance/01-set-secret b/deploy/digitalocean-marketplace/files/var/lib/cloud/scripts/per-instance/01-set-secret
@@ -18,6 +18,7 @@ EOF
 chown saltcorn:saltcorn /home/saltcorn/.config/.saltcorn
 chmod 600 /home/saltcorn/.config/.saltcorn
 sudo -iu saltcorn /home/saltcorn/.local/bin/saltcorn reset-schema -f
+sudo -iu postgres psql -U postgres -d saltcorn -c 'create extension if not exists "uuid-ossp";'
 systemctl daemon-reload
 systemctl start saltcorn
 systemctl enable saltcorn
diff --git a/deploy/digitalocean-marketplace/scripts/20-setup b/deploy/digitalocean-marketplace/scripts/20-setup
@@ -1,4 +1,4 @@
-
+sudo -iu postgres psql -U postgres -d template1 -c 'create extension if not exists "uuid-ossp";'
 sudo -iu postgres psql -U postgres -c "CREATE USER saltcorn WITH CREATEDB;"
 
 adduser --disabled-password --gecos "" saltcorn

diff --git a/packages/server/load_plugins.js b/packages/server/load_plugins.js
@@ -40,7 +40,11 @@ const loadPlugin = async (plugin, force) => {
     res.location
   );
   if (res.plugin_module.onLoad) {
-    await res.plugin_module.onLoad();
+    try {
+      await res.plugin_module.onLoad();
+    } catch (error) {
+      console.error(error);
+    }
   }
   return res;
 };
@@ -82,7 +86,7 @@ const loadAllPlugins = async () => {
   const plugins = await db.select("_sc_plugins");
   for (const plugin of plugins) {
     try {
-      const res = await loadPlugin(plugin);      
+      const res = await loadPlugin(plugin);
     } catch (e) {
       console.error(e);
     }
@@ -105,7 +109,11 @@ const loadAndSaveNewPlugin = async (plugin, force) => {
   }
   getState().registerPlugin(plugin.name, plugin_module, undefined, location);
   if (plugin_module.onLoad) {
-    await plugin_module.onLoad();
+    try {
+      await plugin_module.onLoad();
+    } catch (error) {
+      console.error(error);
+    }
   }
   if (version) plugin.version = version;
   await plugin.upsert();