admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release/2024-11-01 - Misc fixes

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-10-30 09:38:27 -07:00
parent a29e840797
commit 3d10c9da7f
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/dms-log-events/dms-log-events.component.jsx
View File

@@ -44,7 +44,7 @@ function LogLevelHierarchy(level) {
return "orange"; return "orange";
case "INFO": case "INFO":
return "blue"; return "blue";
case "WARNING": case "WARN":
return "yellow"; return "yellow";
case "ERROR": case "ERROR":
return "red"; return "red";

4
client/src/pages/dms-payables/dms-payables.container.jsx
View File

@@ -71,7 +71,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
...logs, ...logs,
{ {
timestamp: new Date(), timestamp: new Date(),
level: "WARNING", level: "WARN",
message: "Reconnected to CDK Export Service" message: "Reconnected to CDK Export Service"
} }
]; ];
@@ -125,7 +125,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
> >
<Select.Option key="DEBUG">DEBUG</Select.Option> <Select.Option key="DEBUG">DEBUG</Select.Option>
<Select.Option key="INFO">INFO</Select.Option> <Select.Option key="INFO">INFO</Select.Option>
<Select.Option key="WARNING">WARNING</Select.Option> <Select.Option key="WARN">WARN</Select.Option>
<Select.Option key="ERROR">ERROR</Select.Option> <Select.Option key="ERROR">ERROR</Select.Option>
</Select> </Select>
<Button onClick={() => setLogs([])}>Clear Logs</Button> <Button onClick={() => setLogs([])}>Clear Logs</Button>

4
client/src/pages/dms/dms.container.jsx
View File

@@ -90,7 +90,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
...logs, ...logs,
{ {
timestamp: new Date(), timestamp: new Date(),
level: "WARNING", level: "warn",
message: "Reconnected to CDK Export Service" message: "Reconnected to CDK Export Service"
} }
]; ];
@@ -175,7 +175,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
> >
<Select.Option key="DEBUG">DEBUG</Select.Option> <Select.Option key="DEBUG">DEBUG</Select.Option>
<Select.Option key="INFO">INFO</Select.Option> <Select.Option key="INFO">INFO</Select.Option>
<Select.Option key="WARNING">WARNING</Select.Option> <Select.Option key="WARN">WARN</Select.Option>
<Select.Option key="ERROR">ERROR</Select.Option> <Select.Option key="ERROR">ERROR</Select.Option>
</Select> </Select>
<Button onClick={() => setLogs([])}>Clear Logs</Button> <Button onClick={() => setLogs([])}>Clear Logs</Button>

2
server/cdk/cdk-wsdl.js
View File

@@ -20,7 +20,7 @@ function CheckCdkResponseForError(socket, soapResponse) {
//The response was null, this might be ok, it might not. //The response was null, this might be ok, it might not.
CdkBase.createLogEvent( CdkBase.createLogEvent(
socket, socket,
"WARNING", "warn",
`Warning detected in CDK Response - it appears to be null. Stack: ${new Error().stack}` `Warning detected in CDK Response - it appears to be null. Stack: ${new Error().stack}`
); );
return; return;

17
server/utils/logger.js
View File

@@ -10,6 +10,18 @@ const WinstonCloudWatch = require("winston-cloudwatch");
const { isString, isEmpty } = require("lodash"); const { isString, isEmpty } = require("lodash");
const { networkInterfaces, hostname } = require("node:os"); const { networkInterfaces, hostname } = require("node:os");
const LOG_LEVELS = {
error: { level: 0, name: "error" },
warn: { level: 1, name: "warn" },
info: { level: 2, name: "info" },
http: { level: 3, name: "http" },
verbose: { level: 4, name: "verbose" },
debug: { level: 5, name: "debug" },
silly: { level: 6, name: "silly" }
};
const normalizeLevel = (level) => (level ? level.toLowerCase() : LOG_LEVELS.debug.name);
const createLogger = () => { const createLogger = () => {
try { try {
const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME); const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
@@ -114,7 +126,7 @@ const createLogger = () => {
const log = (message, type, user, record, meta) => { const log = (message, type, user, record, meta) => {
winstonLogger.log({ winstonLogger.log({
level: type.toLowerCase(), level: normalizeLevel(type),
message, message,
user, user,
record, record,
@@ -131,7 +143,8 @@ const createLogger = () => {
console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || ""); console.error("Error setting up enhanced Logger, defaulting to console.: " + e?.message || "");
return { return {
log: console.log, log: console.log,
logger: console.log logger: console.log,
LOG_LEVELS
}; };
} }
}; };

2
server/web-sockets/web-socket.js
View File

@@ -212,7 +212,7 @@ function LogLevelHierarchy(level) {
return 4; return 4;
case "INFO": case "INFO":
return 3; return 3;
case "WARNING": case "WARN":
return 2; return 2;
case "ERROR": case "ERROR":
return 1; return 1;