database: Fixes regarding of db speed

Added indexes, users.watched reverted to 60s
sogebot · Aug 8, 2018 · 955b7e8 · 955b7e8
1 parent 653017b
commit 955b7e8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/bot/_interface.js b/src/bot/_interface.js
@@ -28,11 +28,18 @@ class Module {
     this._prepare(opts.settings)
     this._sockets()
     this._cleanEmptySettingsValues()
+    this._indexDbs()
     this.status()
+  }
 
+  async _indexDbs () {
     if (cluster.isMaster) {
-      // add indexing to settings
-      global.db.engine.index({ table: this.collection.settings, index: 'category' })
+      if (!global.db.engine.connected) {
+        new Timeout().recursive({ this: this, uid: `${this.constructor.name}._indexDbs`, wait: 1000, fnc: this._indexDbs })
+      } else {
+        // add indexing to settings
+        global.db.engine.index({ table: this.collection.settings, index: 'category' })
+      }
     }
   }
 

diff --git a/src/bot/databases/mongodb.js b/src/bot/databases/mongodb.js
@@ -28,8 +28,15 @@ class IMongoDB extends Interface {
     if (!opts.index) throw new Error('Missing index option')
     if (!opts.table) throw new Error('Missing table option')
 
-    await this.client.db(this.dbName).collection(opts.table).dropIndexes()
-    await this.client.db(this.dbName).collection(opts.table).createIndex(opts.index, { unique: opts.unique })
+    try {
+      let db = await this.client.db(this.dbName)
+      await db.collection(opts.table).dropIndexes()
+      await db.collection(opts.table).createIndex(opts.index, { unique: opts.unique })
+      return
+    } catch (e) {
+      // indexes will be created when collection is available
+      setTimeout(() => this.index(opts), 5000)
+    }
   }
 
   async connect () {
@@ -57,6 +64,7 @@ class IMongoDB extends Interface {
       await db.collection('cache').createIndex('key', { unique: true })
       await db.collection('customTranslations').createIndex('key')
       await db.collection('stats').createIndex('whenOnline')
+      await db.collection('cache.hosts').createIndex('username', { unique: true })
     }
     this.connected = true
   }

diff --git a/src/bot/databases/nedb.js b/src/bot/databases/nedb.js
@@ -47,6 +47,7 @@ class INeDB extends Interface {
         case 'users.points':
         case 'users.messages':
         case 'users.watched':
+        case 'cache.hosts':
           this.table[table].removeIndex('username')
           break
         case 'cache':
@@ -66,6 +67,7 @@ class INeDB extends Interface {
             this.table[table].ensureIndex({fieldName: 'timestamp'})
             break
           case 'users':
+          case 'cache.hosts':
             this.table[table].ensureIndex({fieldName: 'username', unique: true})
             break
           case 'users.online':

diff --git a/src/bot/users.js b/src/bot/users.js
@@ -532,7 +532,7 @@ Users.prototype.delete = function (username) {
 }
 
 Users.prototype.updateWatchTime = async function (lastUpdate) {
-  let timeout = 1000
+  let timeout = 60000
   try {
     // count watching time when stream is online
     if (await global.cache.isOnline()) {