defined logger caller

This commit is contained in:
Jan Prochazka
2023-01-21 17:49:16 +01:00
parent 4d93be61b5
commit cc0f05168d
40 changed files with 46 additions and 41 deletions

View File

@@ -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,

View File

@@ -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();

View File

@@ -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 = {};

View File

@@ -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[]} */

View File

@@ -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;

View File

@@ -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/;

View File

@@ -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[]} */

View File

@@ -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: {

View File

@@ -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);

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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 = {

View File

@@ -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) => {

View File

@@ -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`);

View File

@@ -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) {

View File

@@ -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() {

View File

@@ -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 }) {

View File

@@ -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 }) {

View File

@@ -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,

View File

@@ -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 = {};

View File

@@ -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 }) {

View File

@@ -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);

View File

@@ -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 })}`);

View File

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

View File

@@ -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) => {

View File

@@ -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 = {};

View File

@@ -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
*/