Skip to content

Commit

Permalink
Merge 6c38a11 into c631825
Browse files Browse the repository at this point in the history
  • Loading branch information
joyja committed Sep 20, 2020
2 parents c631825 + 6c38a11 commit c494d5b
Show file tree
Hide file tree
Showing 18 changed files with 203 additions and 139 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ sw.*
# production database
/spread-edge*.db
/tentacle-edge*.db
/database
/database*
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tentacle-edge",
"version": "0.0.22",
"version": "0.0.24",
"description": "A nodejs industrial automation edge gateway with a GraphQL API",
"scripts": {
"lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
Expand Down
1 change: 1 addition & 0 deletions src/__tests__/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ test('create tag with the proper headers and fields returns valid results', asyn
scanClassId: scanClass.id,
max: 200,
min: 0,
deadband: 0,
units: 'thingies',
}
const { createTag } = await client
Expand Down
10 changes: 5 additions & 5 deletions src/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const logger = createLogger({
level: 'info',
format: format.combine(
format.timestamp({
format: 'YYYY-MM-DD HH:mm:ss'
format: 'YYYY-MM-DD HH:mm:ss',
}),
format.errors({ stack: true }),
format.splat(),
Expand All @@ -17,11 +17,11 @@ const logger = createLogger({
// - Write all logs error (and below) to `quick-start-error.log`.
//
new transports.File({ filename: 'tentacle-error.log', level: 'error' }),
new transports.File({ filename: 'tentacle.log' })
new transports.File({ filename: 'tentacle.log' }),
],
exceptionHandlers: [
new transports.File({ filename: 'tentacle-exceptions.log' })
]
new transports.File({ filename: 'tentacle-exceptions.log' }),
],
})

//
Expand All @@ -31,7 +31,7 @@ const logger = createLogger({
if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test') {
logger.add(
new transports.Console({
format: format.combine(format.colorize(), format.simple())
format: format.combine(format.colorize(), format.simple()),
})
)
}
Expand Down
Loading

0 comments on commit c494d5b

Please sign in to comment.