SYNC: Merge branch 'feature/dblogs'

packages/api/src/utility/JsonLinesDatastore.js

@@ -12,10 +12,9 @@ const { jsldir } = require('./directories');
 const LineReader = require('./LineReader');
 
 class JsonLinesDatastore {
-  constructor(file, formatterFunction, resolveNextFile = null) {
+  constructor(file, formatterFunction) {
     this.file = file;
     this.formatterFunction = formatterFunction;
-    this.resolveNextFile = resolveNextFile;
     this.reader = null;
     this.readedDataRowCount = 0;
     this.readedSchemaRow = false;
@@ -23,12 +22,10 @@ class JsonLinesDatastore {
     this.notifyChangedCallback = null;
     this.currentFilter = null;
     this.currentSort = null;
-    this.currentFileName = null;
     if (formatterFunction) {
       const requirePluginFunction = require('./requirePluginFunction');
       this.rowFormatter = requirePluginFunction(formatterFunction);
     }
-
     this.sortedFiles = {};
   }
 
@@ -72,7 +69,6 @@ class JsonLinesDatastore {
     // this.firstRowToBeReturned = null;
     this.currentFilter = null;
     this.currentSort = null;
-    this.currentFileName = null;
     await reader.close();
   }
 
@@ -106,18 +102,8 @@ class JsonLinesDatastore {
     //   return res;
     // }
     for (;;) {
-      let line = await this.reader.readLine();
-      while (!line) {
-        if (!this.currentSort && this.resolveNextFile) {
-          const nextFile = await this.resolveNextFile(this.currentFileName);
-          if (nextFile) {
-            await this.reader.close();
-            this.reader = await this._openReader(nextFile);
-            this.currentFileName = nextFile;
-            line = await this.reader.readLine();
-            continue;
-          }
-        }
+      const line = await this.reader.readLine();
+      if (!line) {
         // EOF
         return null;
       }
@@ -189,7 +175,6 @@ class JsonLinesDatastore {
     }
     if (!this.reader) {
       const reader = await this._openReader(sort ? this.sortedFiles[stableStringify(sort)] : this.file);
-      this.currentFileName = this.file;
       this.reader = reader;
       this.currentFilter = filter;
       this.currentSort = sort;

packages/api/src/utility/appLogStore.js

@@ -17,75 +17,6 @@ async function getLogFiles(timeFrom, timeTo) {
   return logFiles.sort().map(x => path.join(dir, x));
 }
 
-class AppLogDatastore {
-  constructor({ timeFrom, timeTo }) {
-    this.timeFrom = timeFrom;
-    this.timeTo = timeTo;
-  }
-
-  async resolveNextFile(file) {
-    const files = await getLogFiles(this.timeFrom, this.timeTo);
-    const index = files.indexOf(file);
-    if (index < 0 || index >= files.length - 1) return null;
-    return files[index + 1];
-  }
-
-  async getRows(offset = 0, limit = 100, filters = {}) {
-    if (!this.linesReader) {
-      const files = await getLogFiles(this.timeFrom, this.timeTo);
-      this.linesReader = new JsonLinesDatastore(files[0], null, file => this.resolveNextFile(file));
-    }
-
-    const conditions = [
-      {
-        conditionType: 'binary',
-        operator: '>=',
-        left: { exprType: 'column', columnName: 'time' },
-        right: { exprType: 'value', value: this.timeFrom },
-      },
-      {
-        conditionType: 'binary',
-        operator: '<=',
-        left: { exprType: 'column', columnName: 'time' },
-        right: { exprType: 'value', value: this.timeTo },
-      },
-    ];
-    for (const [key, values] of Object.entries(filters)) {
-      if (values.length == 1 && values[0] == null) {
-        // @ts-ignore
-        conditions.push({
-          conditionType: 'isNull',
-          expr: { exprType: 'column', columnName: key },
-        });
-        continue;
-      }
-      // @ts-ignore
-      conditions.push({
-        conditionType: 'in',
-        expr: { exprType: 'column', columnName: key },
-        values,
-      });
-    }
-
-    return this.linesReader.getRows(
-      offset,
-      limit,
-      {
-        conditionType: 'and',
-        conditions,
-      },
-      null
-    );
-  }
-
-  _closeReader() {
-    if (this.linesReader) {
-      this.linesReader._closeReader();
-      this.linesReader = null;
-    }
-  }
-}
-
 const RECENT_LOG_LIMIT = 1000;
 
 let recentLogs = null;
@@ -97,6 +28,27 @@ function adjustRecentLogs() {
   }
 }
 
+async function copyAppLogsIntoFile(timeFrom, timeTo, fileName) {
+  const writeStream = fs.createWriteStream(fileName);
+
+  for (const file of await getLogFiles(timeFrom, timeTo)) {
+    const readStream = fs.createReadStream(file);
+    const reader = new LineReader(readStream);
+    do {
+      const line = await reader.readLine();
+      if (line == null) break;
+      try {
+        const logEntry = JSON.parse(line);
+        if (logEntry.time >= timeFrom && logEntry.time <= timeTo) {
+          writeStream.write(JSON.stringify(logEntry) + '\n');
+        }
+      } catch (e) {
+        continue;
+      }
+    } while (true);
+  }
+}
+
 async function initializeRecentLogProvider() {
   const logs = [];
   for (const file of await getLogFiles(startOfDay(new Date()), new Date())) {
@@ -141,8 +93,8 @@ function getRecentAppLogRecords() {
 }
 
 module.exports = {
-  AppLogDatastore,
   initializeRecentLogProvider,
   getRecentAppLogRecords,
   pushToRecentLogs,
+  copyAppLogsIntoFile,
 };

packages/api/src/utility/connectUtility.js

@@ -132,7 +132,7 @@ async function connectUtility(driver, storedConnection, connectionMode, addition
 
   connection.ssl = await extractConnectionSslParams(connection);
 
-  const conn = await driver.connect({ ...connection, ...additionalOptions });
+  const conn = await driver.connect({ conid: connectionLoaded?._id, ...connection, ...additionalOptions });
   return conn;
 }