From 6962324a455ec831e2d07dd917f06fb791eb9b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Thu, 28 Jun 2018 15:34:31 +0200 Subject: [PATCH] Tried to fix path problem in the master db --- master.js | 6 +++++- sharedPlugins/remoteMap/chunkStore.js | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/master.js b/master.js index 3fff37c0..72080996 100644 --- a/master.js +++ b/master.js @@ -218,7 +218,11 @@ app.get('/metrics', (req, res) => { var Datastore = require('nedb'); db = {}; var LinvoDB = require("linvodb3"); -LinvoDB.dbPath = path.resolve(config.databaseDirectory, "/linvodb/"); + +// TODO: This breaks. databaseDirectory is either "database" or "./database". `LinvoDB.dbPath = "./database/linvodb/";` is the old working version. +LinvoDB.dbPath = path.resolve(config.databaseDirectory, "linvodb"); +// LinvoDB.dbPath = "./database/linvodb/"; + // database for items in system // db.items = new Datastore({ filename: 'database/items.db', autoload: true }); diff --git a/sharedPlugins/remoteMap/chunkStore.js b/sharedPlugins/remoteMap/chunkStore.js index 7146f75b..330ab601 100644 --- a/sharedPlugins/remoteMap/chunkStore.js +++ b/sharedPlugins/remoteMap/chunkStore.js @@ -2,11 +2,12 @@ var mkdirp = require("mkdirp-promise"); var mkdirpSync = require("mkdirp").sync; var fs = require("fs"); var events = require("events"); +var path = require("path"); var objectOps = require("./../../lib/objectOps"); var LinvoDB = require("linvodb3"); -LinvoDB.dbPath = "./database/linvodb/"; +// LinvoDB.dbPath = "./database/linvodb/"; let allowLogging = true; @@ -20,6 +21,7 @@ module.exports = class chunkStore { this.chunkSize = chunkSize; this.path = (path[path.length] == "/") ? path : path+"/"; mkdirpSync(path+name); + LinvoDB.dbPath = this.path; this.db = new LinvoDB(name, {}, {});