Skip to content

Commit 82e17c0

Browse files
committed
Merge branch 'dev' of https://github.com/codeshelldev/wol-redirect into dev
2 parents eaf2f5a + b717109 commit 82e17c0

4 files changed

Lines changed: 17 additions & 1 deletion

File tree

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ _Well, except for meteorite_
1010
Get the latest `docker-compose.yaml` file:
1111

1212
```yaml
13+
<<<<<<< HEAD
14+
=======
15+
---s
16+
>>>>>>> b717109197a2d856bff46c603e369a562b95a948
1317
services:
1418
wol:
1519
container_name: wol-client

docker-compose.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
<<<<<<< HEAD
2+
=======
3+
---s
4+
>>>>>>> b717109197a2d856bff46c603e369a562b95a948
15
services:
26
wol:
37
container_name: wol-client

src/app.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ app.use("/", auth)
2828

2929
app.get("/data", wol)
3030

31+
app.use((err, req, res, next) => {
32+
log.logger.error(err.message)
33+
34+
res.status(500).send("Internal server error")
35+
})
36+
3137
app.listen(env.ENV.port, () => {
3238
log.logger.info(`Server running on Port ${env.ENV.port}`)
3339
})

src/utils/logger.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,10 @@ function Init(logLevel) {
8181
if (logLevel) {
8282
logger.level = logLevel.toLowerCase()
8383
}
84+
}
8485

86+
function Log() {
8587
logger.info(`Initialized Logger with Level of ${logger.level}`)
8688
}
8789

88-
module.exports = { Init, logger }
90+
module.exports = { Init, Log, logger }

0 commit comments

Comments
 (0)