Browse Source

fixed some sqlite issues

tags/v0.3.2
Big Bad Waffle 5 years ago
parent
commit
2200b1dc79
7 changed files with 17 additions and 13 deletions
  1. +4
    -2
      src/server/components/auth.js
  2. +2
    -1
      src/server/components/extensions/socialCommands.js
  3. +1
    -5
      src/server/config/consts.js
  4. +1
    -1
      src/server/config/serverConfig.js
  5. +2
    -1
      src/server/leaderboard/leaderboard.js
  6. +5
    -1
      src/server/mail/mail.js
  7. +2
    -2
      src/server/security/io.js

+ 4
- 2
src/server/components/auth.js View File

@@ -106,14 +106,16 @@ module.exports = {
key: this.charname,
table: 'character',
value: simple,
clean: true
clean: true,
serialize: true
});

await io.setAsync({
key: this.username,
table: 'stash',
value: this.obj.stash.serialize(),
clean: true
clean: true,
serialize: true
});

if (callback)


+ 2
- 1
src/server/components/extensions/socialCommands.js View File

@@ -590,7 +590,8 @@ module.exports = {
await io.setAsync({
key: username,
table: 'skins',
value: JSON.stringify(skins)
value: skins,
serialize: true
});
},



+ 1
- 5
src/server/config/consts.js View File

@@ -3,9 +3,5 @@ module.exports = {
tickTime: 350,

//The maximum level a player can reach
maxLevel: 20,

//Which DB engine to use
// Options: sqlite, rethinkdb
db: 'rethinkdb'
maxLevel: 20
};

+ 1
- 1
src/server/config/serverConfig.js View File

@@ -7,7 +7,7 @@ module.exports = {
//Options:
// sqlite
// rethink
db: 'rethink',
db: 'sqlite',
dbHost: 'localhost',
dbPort: 28015
};

+ 2
- 1
src/server/leaderboard/leaderboard.js View File

@@ -56,7 +56,8 @@ module.exports = {
});

this.list = list.map(l => ({
name: l.id,
//This is a bit of a hack. RethinkDB uses 'id' whereas Sqlite uses 'key'
name: l.key || l.id,
level: l.value.level,
prophecies: l.value.prophecies
}));


+ 5
- 1
src/server/mail/mail.js View File

@@ -1,7 +1,11 @@
let serverConfig = require('../config/serverConfig');

const useDb = process.env.db || serverConfig.db;

const moduleMap = {
sqlite: 'Sqlite',
rethinkdb: 'RethinkDb'
};
const modulePath = `./mail${moduleMap[consts.db]}`;
const modulePath = `./mail${moduleMap[useDb]}`;

module.exports = require(modulePath);

+ 2
- 2
src/server/security/io.js View File

@@ -1,8 +1,8 @@
let fs = require('fs');
let util = require('util');
let serverConfig = require('../config/serverConfig');

if (serverConfig.db === 'rethink') {
//eslint-disable-next-line no-process-env
if ((process.env.db || serverConfig.db) === 'rethink') {
module.exports = require('./ioRethink');
return;
}


Loading…
Cancel
Save