#84 change logs backend

stefanwerfling · Jan 16, 2025 · c4852aa · c4852aa
1 parent 585c089
commit c4852aa
Show file tree

Hide file tree

Showing 34 changed files with 420 additions and 227 deletions.
diff --git a/backend/src/Routes/Main/Listen/Save.ts b/backend/src/Routes/Main/Listen/Save.ts
@@ -9,7 +9,7 @@ import {
     NginxListenDB,
     NginxListenServiceDB, NginxListenVariableDB, NginxListenVariableServiceDB
 } from 'flyingfish_core';
-import {NginxStreamServerVariables} from '../../../inc/Nginx/NginxVariables.js';
+import {NginxStreamServerVariables} from '../../../inc/Nginx/NginxStreamServerVariables.js';
 
 /**
  * AllowedRouteVariableServer
@@ -44,9 +44,9 @@ export class Save {
                 aListen = tListen;
 
                 if (aListen) {
-                    Logger.getLogger().silly(`Listen::saveListen: Found listen by id: ${aListen.id}`);
+                    Logger.getLogger().silly('Listen::saveListen: Found listen by id: %d', aListen.id);
                 } else {
-                    Logger.getLogger().error(`Listen::saveListen: Not found listen by id: ${data.id}`);
+                    Logger.getLogger().error('Listen::saveListen: Not found listen by id: %d', data.id);
                 }
             } else {
                 return {
@@ -68,7 +68,7 @@ export class Save {
         }
 
         if (aListen.listen_port !== data.port) {
-            Logger.getLogger().silly(`Listen::saveListen: Port diff by: DB Port: ${aListen.listen_port} and request: ${data.port}`);
+            Logger.getLogger().silly('Listen::saveListen: Port diff by: DB Port: %d and request: %d', aListen.listen_port, data.port);
 
             const count = await NginxListenServiceDB.getInstance().countByPort(data.port);
 

diff --git a/backend/src/Routes/Main/Login/Login.ts b/backend/src/Routes/Main/Login/Login.ts
@@ -27,14 +27,14 @@ export class Login {
                 session.user.userid = user.id;
                 session.user.isLogin = true;
 
-                Logger.getLogger().info(`Login success by session: ${session.id}`);
+                Logger.getLogger().info('Login success by session: %s', session.id);
 
                 return {
                     statusCode: StatusCodes.OK
                 };
             }
 
-            Logger.getLogger().warn(`Login faild: wrong password by email: ${login.email}`);
+            Logger.getLogger().warn('Login faild: wrong password by email: %s', login.email);
 
             return {
                 statusCode: StatusCodes.INTERNAL_ERROR,

diff --git a/backend/src/Routes/Main/Login/Logout.ts b/backend/src/Routes/Main/Login/Logout.ts
@@ -16,7 +16,7 @@ export class Logout {
             session.user.isLogin = false;
         }
 
-        Logger.getLogger().info(`Logout success by session: ${session.id}`);
+        Logger.getLogger().info('Logout success by session: %s', session.id);
 
         return {
             statusCode: StatusCodes.OK

diff --git a/backend/src/Routes/Main/Route/Http/Save.ts b/backend/src/Routes/Main/Route/Http/Save.ts
@@ -5,7 +5,7 @@ import {
     NginxHttpVariableServiceDB, NginxLocationDB, NginxLocationServiceDB
 } from 'flyingfish_core';
 import {DefaultReturn, NginxHttpVariableContextType, RouteHttpSave, StatusCodes} from 'flyingfish_schemas';
-import {NginxHTTPVariables} from '../../../../inc/Nginx/NginxVariables.js';
+import {NginxHTTPVariables} from '../../../../inc/Nginx/NginxHTTPVariables.js';
 
 /**
  * AllowedRouteVariableServer

diff --git a/backend/src/Routes/Njs/AddressAccess.ts b/backend/src/Routes/Njs/AddressAccess.ts
@@ -28,7 +28,12 @@ export class AddressAccess extends DefaultRoute {
         remote_addr: string,
         type: string
     ): Promise<boolean> {
-        Logger.getLogger().info(`AddressAccess::access: realip_remote_addr: ${realip_remote_addr} remote_addr: ${remote_addr} type: ${type}`);
+        Logger.getLogger().info(
+            'AddressAccess::access: realip_remote_addr: %s remote_addr: %s type: %s',
+            realip_remote_addr,
+            remote_addr,
+            type
+        );
 
         const listenId = parseInt(listen_id, 10) || 0;
 
@@ -60,15 +65,15 @@ export class AddressAccess extends DefaultRoute {
         const address = await IpBlacklistServiceDB.getInstance().findByIp(realip_remote_addr, false);
 
         if (!address) {
-            Logger.getLogger().info(`AddressAccess::_globalCheckBlacklist: Address(${realip_remote_addr}) not found in blacklist.`);
+            Logger.getLogger().info('AddressAccess::_globalCheckBlacklist: Address(%s) not found in blacklist.', realip_remote_addr);
 
             return true;
         }
 
         // update and not await
         IpBlacklistServiceDB.getInstance().updateBlock(address.id, address.count_block + 1).then();
 
-        Logger.getLogger().info(`AddressAccess::_globalCheckBlacklist: Address(${realip_remote_addr}) found in blacklist!`);
+        Logger.getLogger().info('AddressAccess::_globalCheckBlacklist: Address(%s) found in blacklist!', realip_remote_addr);
 
         return false;
     }
@@ -97,7 +102,7 @@ export class AddressAccess extends DefaultRoute {
                 return true;
             }
         } else {
-            Logger.getLogger().warn(`AddressAccess::_listCheck: Listen(${listenId}) not found!`);
+            Logger.getLogger().warn('AddressAccess::_listCheck: Listen(%d) not found!', listenId);
         }
 
         return false;
@@ -113,12 +118,12 @@ export class AddressAccess extends DefaultRoute {
         const address = await IpBlacklistServiceDB.getInstance().findByIp(realip_remote_addr, false);
 
         if (!address) {
-            Logger.getLogger().info(`AddressAccess::_listCheckBlackList: Address(${realip_remote_addr}) not found in blacklist.`);
+            Logger.getLogger().info('AddressAccess::_listCheckBlackList: Address(%s) not found in blacklist.', realip_remote_addr);
 
             return true;
         }
 
-        Logger.getLogger().info(`AddressAccess::_listCheckBlackList: Address(${realip_remote_addr}) found in blacklist!`);
+        Logger.getLogger().info('AddressAccess::_listCheckBlackList: Address(%s) found in blacklist!', realip_remote_addr);
 
         // update and not await
         IpBlacklistServiceDB.getInstance().updateBlock(address.id, address.count_block + 1).then();
@@ -136,15 +141,15 @@ export class AddressAccess extends DefaultRoute {
         const address = await IpWhitelistServiceDB.getInstance().findByIp(realip_remote_addr, false);
 
         if (address) {
-            Logger.getLogger().info(`AddressAccess::_listCheckWhiteList: Address(${realip_remote_addr}) found in whitelist!`);
+            Logger.getLogger().info('AddressAccess::_listCheckWhiteList: Address(%s) found in whitelist!', realip_remote_addr);
 
             // update and not await
             IpWhitelistServiceDB.getInstance().updateAccess(address.id, address.count_access + 1).then();
 
             return true;
         }
 
-        Logger.getLogger().info(`AddressAccess::_listCheckWhiteList: Address(${realip_remote_addr}) not found in whitelist.`);
+        Logger.getLogger().info('AddressAccess::_listCheckWhiteList: Address(%s) not found in whitelist.', realip_remote_addr);
 
         return false;
     }

diff --git a/backend/src/Routes/Njs/AuthBasic.ts b/backend/src/Routes/Njs/AuthBasic.ts
@@ -19,8 +19,7 @@ export class AuthBasic extends DefaultRoute {
         location_id: string,
         authHeader: string
     ): Promise<boolean> {
-        Logger.getLogger().info(`check -> location_id: ${location_id}`);
-        Logger.getLogger().info(`check -> authheader: ${authHeader}`);
+        Logger.getLogger().info('check -> location_id: %s authheader:', location_id, authHeader);
 
         const auth = BasicAuthParser.parse(authHeader);
 
@@ -40,7 +39,7 @@ export class AuthBasic extends DefaultRoute {
                     break;
             }
 
-            Logger.getLogger().info(`check -> scheme: ${auth.scheme}, username: ${auth.username}, password: *****`);
+            Logger.getLogger().info('check -> scheme: %s, username: %s, password: *****', auth.scheme, auth.username);
 
             if (resulte) {
                 response.status(200).send();

diff --git a/backend/src/inc/Analysis/Ip/IpBlacklist.ts b/backend/src/inc/Analysis/Ip/IpBlacklist.ts
@@ -114,7 +114,7 @@ export class IpBlacklist {
         const dns = new DNS();
         const result = await dns.resolveA(dnsName);
 
-        Logger.getLogger().silly(`IpBlacklist::checkdnsrr: result for "${dnsName}" is: ${result.answers.length > 0}`);
+        Logger.getLogger().silly('IpBlacklist::checkdnsrr: result for "%s" is: %d', dnsName, result.answers.length > 0);
 
         return result.answers.length > 0;
     }

diff --git a/backend/src/inc/Cert/CertTask.ts b/backend/src/inc/Cert/CertTask.ts
@@ -1,4 +1,4 @@
-import {NginxHttpDB} from 'flyingfish_core/dist/src/index.js';
+import {NginxHttpDB} from 'flyingfish_core';
 
 /**
  * Cert Task object

diff --git a/backend/src/inc/Credential/Credential.ts b/backend/src/inc/Credential/Credential.ts
@@ -24,7 +24,7 @@ export class Credential {
         const location = await NginxLocationServiceDB.getInstance().findOne(nLocationId);
 
         if (location) {
-            Logger.getLogger().silly(`Credential::authBasic: location found by id: ${location.id}`);
+            Logger.getLogger().silly('Credential::authBasic: location found by id: %d', location.id);
 
             const credLocactions = await CredentialLocationServiceDB.getInstance().getListByLocation(location.id);
 
@@ -34,7 +34,7 @@ export class Credential {
                 })
             );
 
-            Logger.getLogger().silly(`Credential::authBasic: Found credentials: ${credentials.length}`);
+            Logger.getLogger().silly('Credential::authBasic: Found credentials: %d', credentials.length);
 
             const cps = new CredentialProviders();
 
@@ -43,21 +43,21 @@ export class Credential {
                 const credentialObj = await cps.getProvider(credential.provider);
 
                 if (credentialObj) {
-                    Logger.getLogger().silly(`Credential::authBasic: Use credential object: ${credentialObj}`);
+                    Logger.getLogger().silly('Credential::authBasic: Use credential object: %o', credentialObj);
 
                     const credentialAuthBasic = credentialObj.getCredential(credential.id) as ICredentialAuthBasic;
 
                     const result = await credentialAuthBasic.authBasic(auth.username, auth.password);
 
-                    Logger.getLogger().silly(`Credential::authBasic: credential object result: ${result}`);
+                    Logger.getLogger().silly('Credential::authBasic: credential object result: %d', result);
 
                     if (result) {
                         return true;
                     }
                 }
             }
         } else {
-            Logger.getLogger().error(`Credential::authBasic: Location not found: ${locationId}`);
+            Logger.getLogger().error('Credential::authBasic: Location not found: %s', locationId);
         }
 
         return false;

diff --git a/backend/src/inc/Db/InfluxDb/Entity/NginxStreamAccess.ts b/backend/src/inc/Db/InfluxDb/Entity/NginxStreamAccess.ts
@@ -39,7 +39,9 @@ export class NginxStreamAccess {
             } catch (error) {
                 if (error instanceof Error) {
                     Logger.getLogger().error(
-                        `NginxStreamAccess::addLog: parse int from upstream_bytes_sent: "${error.message}" by value: "${log.upstream_bytes_sent}"`
+                        'NginxStreamAccess::addLog: parse int from upstream_bytes_sent: "%s" by value: "%s"',
+                        error.message,
+                        log.upstream_bytes_sent
                     );
                 } else {
                     throw error;
@@ -103,7 +105,7 @@ export class NginxStreamAccess {
                 message = e.message;
             }
 
-            Logger.getLogger().error(`NginxStreamAccess::getRangeLastRequestCounts: request error: ${message}`);
+            Logger.getLogger().error('NginxStreamAccess::getRangeLastRequestCounts: request error: %s', message);
         }
 
         return list;

diff --git a/backend/src/inc/Db/InfluxDb/InfluxDbHelper.ts b/backend/src/inc/Db/InfluxDb/InfluxDbHelper.ts
@@ -104,8 +104,7 @@ export class InfluxDbHelper {
         writeApi
         .close()
         .catch((e) => {
-            Logger.getLogger().error('InfluxDbHelper::addPoint: Error: ');
-            Logger.getLogger().error(e);
+            Logger.getLogger().error('InfluxDbHelper::addPoint: Error: ', e);
 
             if (e instanceof HttpError && e.statusCode === 401) {
                 Logger.getLogger().error('InfluxDbHelper::addPoint: setup a new InfluxDB database');

diff --git a/backend/src/inc/Dns/Dns2Server.ts b/backend/src/inc/Dns/Dns2Server.ts
@@ -143,7 +143,8 @@ export class Dns2Server implements IDnsServer {
                             recordSettings = JSON.parse(record.settings);
                         } catch (e) {
                             Logger.getLogger().error(
-                                `Record settings parse failed: ${record.id}`,
+                                'Record settings parse failed: %d',
+                                record.id,
                                 {
                                     class: 'Dns2Server::_handleRequest'
                                 }
@@ -226,7 +227,8 @@ export class Dns2Server implements IDnsServer {
 
                         for (const error of settingsErrors) {
                             Logger.getLogger().error(
-                                `Setting error: ${error}`,
+                                'Setting error: %s',
+                                error,
                                 {
                                     class: 'Dns2Server::_handleRequest',
                                     requestid: request.header.id
@@ -262,7 +264,9 @@ export class Dns2Server implements IDnsServer {
             }
 
             Logger.getLogger().info(
-                `Found match, send (${response.answers.length}) by request-id: ${request.header.id}`,
+                'Found match, send (%d) by request-id: %s',
+                response.answers.length,
+                request.header.id,
                 {
                     class: 'Dns2Server::_handleRequest',
                     requestid: request.header.id
@@ -272,7 +276,9 @@ export class Dns2Server implements IDnsServer {
             return response;
         } catch (e) {
             Logger.getLogger().info(
-                `Faild to processing the dns question by: ${rinfo.address}:${rinfo.port}`,
+                'Faild to processing the dns question by: %s:%d',
+                rinfo.address,
+                rinfo.port,
                 {
                     class: 'Dns2Server::_handleRequest:',
                     requestid: request.header.id
@@ -281,7 +287,8 @@ export class Dns2Server implements IDnsServer {
         }
 
         Logger.getLogger().warn(
-            `No match found, return null as answer by request-id: ${request.header.id}`,
+            'No match found, return null as answer by request-id: %s',
+            request.header.id,
             {
                 class: 'Dns2Server::_handleRequest:',
                 requestid: request.header.id
@@ -412,7 +419,8 @@ export class Dns2Server implements IDnsServer {
         });
 
         Logger.getLogger().info(
-            `Flingfish DNS listening on the TCP/UDP: ${port}`,
+            'Flingfish DNS listening on the TCP/UDP: %d',
+            port,
             {
                 class: 'Dns2Server::listen'
             }
@@ -439,7 +447,9 @@ export class Dns2Server implements IDnsServer {
         records.set(tmpId, record);
 
         Logger.getLogger().silly(
-            `Add temp record (${record.type}) to domain-id: ${domainId}`,
+            'Add temp record (%d) to domain-id: %d',
+            record.type,
+            domainId,
             {
                 class: 'Dns2Server::addTempRecord'
             }
@@ -492,7 +502,8 @@ export class Dns2Server implements IDnsServer {
     ): boolean {
         if (!this._tempDomains.has(domainName)) {
             Logger.getLogger().silly(
-                `Add temp domain: ${domainName}`,
+                'Add temp domain: $s',
+                domainName,
                 {
                     class: 'Dns2Server::addTempDomain'
                 }

diff --git a/backend/src/inc/HimHIP/HimHIP.ts b/backend/src/inc/HimHIP/HimHIP.ts
@@ -59,11 +59,14 @@ export class HimHIP extends RedisChannel<HimHIPData> {
      * @param {HimHIPData} data
      */
     public async listen(data: HimHIPData): Promise<void> {
-        Logger.getLogger().silly(`HimHIP::listen: receive data -> Gateway-Mac: "${data.gatewaymac}", ` +
-            `Network: "${data.network}", ` +
-            `Gateway: "${data.gateway}, ` +
-            `Interface: "${data.interface}", ` +
-            `Host-IP: "${data.hostip}"`);
+        Logger.getLogger().silly(
+            'HimHIP::listen: receive data -> Gateway-Mac: "%s", Network: "%s", Gateway: "%s, Interface: "%s", Host-IP: "%s"',
+            data.gatewaymac,
+            data.network,
+            data.gateway,
+            data.interface,
+            data.hostip
+        );
 
         if (SchemaHimHIPData.validate(data, [])) {
             HimHIP.setData(data);

diff --git a/backend/src/inc/Nginx/NginxVariables.ts → backend/src/inc/Nginx/NginxHTTPVariables.ts b/backend/src/inc/Nginx/NginxVariables.ts → backend/src/inc/Nginx/NginxHTTPVariables.ts
@@ -24,14 +24,4 @@ export class NginxHTTPVariables {
     public static resolver = 'resolver';
     public static resolver_timeout = 'resolver_timeout';
 
-}
-
-/**
- * Nginx stream server variables
- */
-export class NginxStreamServerVariables {
-
-    public static proxy_timeout = 'proxy_timeout';
-    public static proxy_connect_timeout = 'proxy_connect_timeout';
-
 }
diff --git a/backend/src/inc/Nginx/NginxServer.ts b/backend/src/inc/Nginx/NginxServer.ts
@@ -141,7 +141,7 @@ export class NginxServer {
 
         const args = this._getArguments();
 
-        Logger.getLogger().silly(`NginxServer::start: start nginx with: ${this._command} ${args.join(' ')}`);
+        Logger.getLogger().silly('NginxServer::start: start nginx with: %s %s', this._command, args.join(' '));
 
         this._process = spawn(this._command, args);
 
@@ -150,17 +150,17 @@ export class NginxServer {
 
             for (const entry of logs) {
                 if (entry.trim() !== '') {
-                    Logger.getLogger().info(`NginxServer::stdout: ${entry}`);
+                    Logger.getLogger().info('NginxServer::stdout: %s', entry);
                 }
             }
         });
 
         this._process.stderr!.on('data', (buf) => {
-            const logs = buf.toString().split('\n');
+            const logs: string[] = buf.toString().split('\n');
 
             for (const entry of logs) {
                 if (entry.trim() !== '') {
-                    Logger.getLogger().error(`NginxServer::stderr: ${entry}`);
+                    Logger.getLogger().error('NginxServer::stderr: %s', entry);
                 }
             }
         });