defined logger caller

package.json

@@ -9,6 +9,7 @@
   ],
   "scripts": {
     "start:api": "yarn workspace dbgate-api start | pino-pretty",
+    "start:api:json": "yarn workspace dbgate-api start",
     "start:app": "cd app && yarn start",
     "start:api:debug": "cross-env DEBUG=* yarn workspace dbgate-api start",
     "start:app:debug": "cd app && cross-env DEBUG=* yarn start",

packages/api/src/controllers/archive.js

@@ -8,7 +8,7 @@ const loadFilesRecursive = require('../utility/loadFilesRecursive');
 const getJslFileName = require('../utility/getJslFileName');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('archive');
 
 module.exports = {
   folders_meta: true,

packages/api/src/controllers/auth.js

@@ -6,7 +6,7 @@ const { getLogins } = require('../utility/hasPermission');
 const { getLogger } = require('dbgate-tools');
 const AD = require('activedirectory2').promiseWrapper;
 
-const logger = getLogger();
+const logger = getLogger('auth');
 
 const tokenSecret = uuidv1();
 

packages/api/src/controllers/connections.js

@@ -16,7 +16,7 @@ const { safeJsonParse, getLogger } = require('dbgate-tools');
 const platformInfo = require('../utility/platformInfo');
 const { connectionHasPermission, testConnectionPermission } = require('../utility/hasPermission');
 
-const logger = getLogger();
+const logger = getLogger('connections');
 
 let volatileConnections = {};
 

packages/api/src/controllers/databaseConnections.js

@@ -30,7 +30,7 @@ const processArgs = require('../utility/processArgs');
 const { testConnectionPermission } = require('../utility/hasPermission');
 const { MissingCredentialsError } = require('../utility/exceptions');
 
-const logger = getLogger();
+const logger = getLogger('databaseConnections');
 
 module.exports = {
   /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */

packages/api/src/controllers/runners.js

@@ -16,7 +16,7 @@ const {
 const { handleProcessCommunication } = require('../utility/processComm');
 const processArgs = require('../utility/processArgs');
 const platformInfo = require('../utility/platformInfo');
-const logger = getLogger();
+const logger = getLogger('runners');
 
 function extractPlugins(script) {
   const requireRegex = /\s*\/\/\s*@require\s+([^\s]+)\s*\n/g;
@@ -36,7 +36,7 @@ const requirePluginsTemplate = (plugins, isExport) =>
 
 const scriptTemplate = (script, isExport) => `
 const dbgateApi = require(${isExport ? `'dbgate-api'` : 'process.env.DBGATE_API'});
-const logger = dbgateApi.getLogger();
+const logger = dbgateApi.getLogger('script');
 dbgateApi.initializeApiEnvironment();
 ${requirePluginsTemplate(extractPlugins(script), isExport)}
 require=null;

packages/api/src/controllers/scheduler.js

@@ -6,7 +6,7 @@ const runners = require('./runners');
 const { hasPermission } = require('../utility/hasPermission');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('scheduler');
 
 const scheduleRegex = /\s*\/\/\s*@schedule\s+([^\n]+)\n/;
 

packages/api/src/controllers/sessions.js

@@ -10,7 +10,7 @@ const processArgs = require('../utility/processArgs');
 const { appdir } = require('../utility/directories');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('sessions');
 
 module.exports = {
   /** @type {import('dbgate-types').OpenedSession[]} */

packages/api/src/controllers/uploads.js

@@ -2,7 +2,7 @@ const path = require('path');
 const { uploadsdir } = require('../utility/directories');
 const uuidv1 = require('uuid/v1');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('uploads');
 
 module.exports = {
   upload_meta: {

packages/api/src/main.js

@@ -35,7 +35,7 @@ const { getLogins } = require('./utility/hasPermission');
 const _ = require('lodash');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('main');
 
 function start() {
   // console.log('process.argv', process.argv);

packages/api/src/proc/databaseConnectionProcess.js

@@ -9,7 +9,7 @@ const { SqlGenerator } = require('dbgate-tools');
 const generateDeploySql = require('../shell/generateDeploySql');
 const { dumpSqlSelect } = require('dbgate-sqltree');
 
-const logger = getLogger();
+const logger = getLogger('dbconnProcess');
 
 let systemConnection;
 let storedConnection;

packages/api/src/proc/serverConnectionProcess.js

@@ -4,7 +4,7 @@ const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
-const logger = getLogger();
+const logger = getLogger('srvconnProcess');
 
 let systemConnection;
 let storedConnection;

packages/api/src/proc/sessionProcess.js

@@ -12,7 +12,7 @@ const connectUtility = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('sessionProcess');
 
 let systemConnection;
 let storedConnection;

packages/api/src/proc/sshForwardProcess.js

@@ -5,7 +5,7 @@ const { handleProcessCommunication } = require('../utility/processComm');
 const { SSHConnection } = require('../utility/SSHConnection');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('sshProcess');
 
 async function getSshConnection(connection) {
   const sshConfig = {

packages/api/src/shell/dumpDatabase.js

@@ -2,7 +2,7 @@ const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('dumpDb');
 
 function doDump(dumper) {
   return new Promise((resolve, reject) => {

packages/api/src/shell/executeQuery.js

@@ -2,7 +2,7 @@ const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('execQuery');
 
 async function executeQuery({ connection = undefined, systemConnection = undefined, driver = undefined, sql }) {
   logger.info({ sql }, `Execute query`);

packages/api/src/shell/importDatabase.js

@@ -6,7 +6,7 @@ const download = require('./download');
 const stream = require('stream');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('importDb');
 
 class ImportStream extends stream.Transform {
   constructor(pool, driver) {

packages/api/src/shell/jsonArrayWriter.js

@@ -2,7 +2,7 @@ const { getLogger } = require('dbgate-tools');
 const fs = require('fs');
 const stream = require('stream');
 
-const logger = getLogger();
+const logger = getLogger('jsonArrayWriter');
 
 class StringifyStream extends stream.Transform {
   constructor() {

packages/api/src/shell/jsonLinesReader.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const stream = require('stream');
 const byline = require('byline');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('jsonLinesReader');
 
 class ParseStream extends stream.Transform {
   constructor({ limitRows }) {

packages/api/src/shell/jsonLinesWriter.js

@@ -1,7 +1,7 @@
 const { getLogger } = require('dbgate-tools');
 const fs = require('fs');
 const stream = require('stream');
-const logger = getLogger();
+const logger = getLogger('jsonLinesWriter');
 
 class StringifyStream extends stream.Transform {
   constructor({ header }) {

packages/api/src/shell/queryReader.js

@@ -1,7 +1,7 @@
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('queryReader');
 
 async function queryReader({
   connection,

packages/api/src/shell/requirePlugin.js

@@ -4,7 +4,7 @@ const { pluginsdir, packagedPluginsDir, getPluginBackendPath } = require('../uti
 const nativeModules = require('../nativeModules');
 const platformInfo = require('../utility/platformInfo');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('requirePlugin');
 
 const loadedPlugins = {};
 

packages/api/src/shell/sqlDataWriter.js

@@ -3,7 +3,7 @@ const stream = require('stream');
 const path = require('path');
 const { driverBase, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const logger = getLogger();
+const logger = getLogger('sqlDataWriter');
 
 class SqlizeStream extends stream.Transform {
   constructor({ fileName, dataName }) {

packages/api/src/shell/tableReader.js

@@ -1,7 +1,7 @@
 const { quoteFullName, fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
-const logger = getLogger();
+const logger = getLogger('tableReader');
 
 async function tableReader({ connection, pureName, schemaName }) {
   const driver = requireEngineDriver(connection);

packages/api/src/shell/tableWriter.js

@@ -1,7 +1,7 @@
 const { fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const connectUtility = require('../utility/connectUtility');
-const logger = getLogger();
+const logger = getLogger('tableWriter');
 
 async function tableWriter({ connection, schemaName, pureName, driver, systemConnection, ...options }) {
   logger.info(`Writing table ${fullNameToString({ schemaName, pureName })}`);

packages/api/src/utility/childProcessChecker.js

@@ -1,6 +1,6 @@
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('childProcessChecked');
 
 let counter = 0;
 

packages/api/src/utility/directories.js

@@ -6,7 +6,7 @@ const platformInfo = require('./platformInfo');
 const processArgs = require('./processArgs');
 const consoleObjectWriter = require('../shell/consoleObjectWriter');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('directories');
 
 const createDirectories = {};
 const ensureDirectory = (dir, clean) => {

packages/api/src/utility/sshTunnel.js

@@ -6,7 +6,7 @@ const lock = new AsyncLock();
 const { fork } = require('child_process');
 const processArgs = require('../utility/processArgs');
 const { getLogger } = require('dbgate-tools');
-const logger = getLogger();
+const logger = getLogger('sshTunnel');
 
 const sshTunnelCache = {};
 

packages/api/src/utility/useController.js

@@ -4,7 +4,7 @@ const getExpressPath = require('./getExpressPath');
 const { MissingCredentialsError } = require('./exceptions');
 const { getLogger } = require('dbgate-tools');
 
-const logger = getLogger();
+const logger = getLogger('useController');
 /**
  * @param {string} route
  */

packages/tools/src/DatabaseAnalyser.ts

@@ -5,7 +5,7 @@ import _pick from 'lodash/pick';
 import _compact from 'lodash/compact';
 import { getLogger } from './getLogger';
 
-const logger = getLogger();
+const logger = getLogger('dbAnalyser');
 
 const STRUCTURE_FIELDS = ['tables', 'collections', 'views', 'matviews', 'functions', 'procedures', 'triggers'];
 

packages/tools/src/SqlGenerator.ts

@@ -13,7 +13,7 @@ import { getLogger } from './getLogger';
 import { SqlDumper } from './SqlDumper';
 import { extendDatabaseInfo } from './structureTools';
 
-const logger = getLogger();
+const logger = getLogger('sqlGenerator');
 
 interface SqlGeneratorOptions {
   dropTables: boolean;

packages/tools/src/createBulkInsertStreamBase.ts

@@ -2,7 +2,7 @@ import _intersection from 'lodash/intersection';
 import { getLogger } from './getLogger';
 import { prepareTableForImport } from './tableTransforms';
 
-const logger = getLogger();
+const logger = getLogger('bulkStreamBase');
 
 export function createBulkInsertStreamBase(driver, stream, pool, name, options): any {
   const fullNameQuoted = name.schemaName

packages/tools/src/getLogger.ts

@@ -7,6 +7,10 @@ export function setLogger(value: Logger) {
   _logger = value;
 }
 
-export function getLogger(): Logger {
+export function getLogger(caller?: string): Logger {
-  return _logger || defaultLogger;
+  let res = _logger || defaultLogger;
+  if (caller) {
+    res = res.child({ caller });
+  }
+  return res;
 }

plugins/dbgate-plugin-csv/src/backend/writer.js

@@ -4,7 +4,7 @@ const stream = require('stream');
 
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('csvWriter');
 
 class CsvPrepareStream extends stream.Transform {
   constructor({ header }) {

plugins/dbgate-plugin-mongo/src/backend/createBulkInsertStream.js

@@ -1,7 +1,7 @@
 const ObjectId = require('mongodb').ObjectId;
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('mongoBulkInsert');
 
 
 function createBulkInsertStream(driver, stream, pool, name, options) {

plugins/dbgate-plugin-mysql/src/backend/drivers.js

@@ -7,7 +7,7 @@ const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-to
 const { MySqlDumper } = require('antares-mysql-dumper');
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('mysqlDriver');
 
 function extractColumns(fields) {
   if (fields) {

plugins/dbgate-plugin-postgres/src/backend/drivers.js

@@ -7,7 +7,7 @@ const pg = require('pg');
 const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('postreDriver');
 
 pg.types.setTypeParser(1082, 'text', val => val); // date
 pg.types.setTypeParser(1114, 'text', val => val); // timestamp without timezone

plugins/dbgate-plugin-sqlite/src/backend/driver.js

@@ -6,7 +6,7 @@ const { splitQuery, sqliteSplitterOptions } = require('dbgate-query-splitter');
 const { createBulkInsertStreamBase, makeUniqueColumnNames } = require('dbgate-tools');
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('sqliteDriver');
 
 let Database;
 

plugins/dbgate-plugin-xml/src/backend/reader.js

@@ -3,7 +3,7 @@ const stream = require('stream');
 const NodeXmlStream = require('node-xml-stream-parser');
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('xmlReader');
 
 class ParseStream extends stream.Transform {
   constructor({ itemElementName }) {

plugins/dbgate-plugin-xml/src/backend/writer.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const stream = require('stream');
 const { getLogger } = global.DBGATE_TOOLS;
 
-const logger = getLogger();
+const logger = getLogger('xmlWriter');
 
 function escapeXml(value) {
   return value.replace(/[<>&'"]/g, function (c) {