Generate storage profile dynamically

app/config.js

@@ -36,11 +36,11 @@ config.environment = environment;
 // Log resulting env vars in use by config
 [
   'NODE_ENV',
+  'NODE_APP_INSTANCE',
   'NODE_CONFIG_DIR',
   'NODE_CONFIG',
   'ALLOW_CONFIG_MUTATIONS',
   'HOSTNAME',
-  'NODE_APP_INSTANCE',
   'SUPPRESS_NO_CONFIG_WARNING',
 ].forEach(s => {
   console.log(`${s} ${config.util.getEnv(s)}`);

app/user_config.js

@@ -1,15 +1,30 @@
 const path = require('path');
+const process = require('process');
 
 const { app } = require('electron');
 
 const { start } = require('./base_config');
 const config = require('./config');
 
-// Use separate data directory for development
-if (config.has('storageProfile')) {
+let storageProfile;
+const { NODE_ENV: environment, NODE_APP_INSTANCE:instance } = process.env;
+const isProduction = environment === 'production' && !instance;
+
+// Use seperate data directories for each different environment and app instances
+// We should prioritise config values first
+if (config.has(storageProfile)) {
+  storageProfile = config.get('storageProfile');
+} else if (!isProduction) {
+  storageProfile = environment;
+  if (instance) {
+    storageProfile = storageProfile.concat(`-${instance}`)
+  }
+}
+
+if (storageProfile) {
   const userData = path.join(
     app.getPath('appData'),
-    `Loki-Messenger-${config.get('storageProfile')}`
+    `Session-${storageProfile}`
   );
 
   app.setPath('userData', userData);

config/development-1.json

@@ -1,3 +0,0 @@
-{
-  "storageProfile": "development1"
-}

config/development.json

@@ -1,5 +1,4 @@
 {
-  "storageProfile": "development",
   "seedNodeList": [
     {
       "ip": "public.loki.foundation",

config/local-devprod1.json

@@ -1,6 +0,0 @@
-{
-  "storageProfile": "devprod1Profile",
-  "localServerPort": "8082",
-  "openDevTools": true,
-  "updatesEnabled": false
-}

config/production-devprod.json

@@ -1,5 +1,4 @@
 {
-  "storageProfile": "devprodProfile",
   "openDevTools": true,
   "updatesEnabled": false
 }

config/production-devprod1.json

@@ -0,0 +1,4 @@
+{
+  "openDevTools": true,
+  "updatesEnabled": false
+}

config/swarm-testing-2.json

@@ -1,3 +0,0 @@
-{
-  "storageProfile": "swarm-testing2"
-}

config/swarm-testing.json

@@ -1,5 +1,4 @@
 {
-  "storageProfile": "swarm-testing",
   "seedNodeList": [
     {
       "ip": "localhost",