Skip to content

Commit adef792

Browse files
committed
Use app logger
Instead of console.
1 parent b604b4e commit adef792

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Sources/express/Render.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Noze.io / Macro / ExExpress
44
//
55
// Created by Helge Heß on 6/2/16.
6-
// Copyright © 2016-2023 ZeeZide GmbH. All rights reserved.
6+
// Copyright © 2016-2025 ZeeZide GmbH. All rights reserved.
77
//
88

99
import enum MacroCore.process
@@ -42,7 +42,7 @@ public extension ServerResponse {
4242
*/
4343
func render(_ template: String, _ options : Any? = nil) {
4444
guard let app = self.app else {
45-
console.error("No app object assigned to response: \(self)")
45+
log.error("No app object assigned to response: \(self)")
4646
emit(error: ExpressRenderingError.responseHasNoAppObject)
4747
finishRender500IfNecessary()
4848
return
@@ -67,9 +67,10 @@ public extension Express {
6767
* Refer to the `ServerResponse.render` method for details.
6868
*/
6969
func render(template: String, options: Any?, to res: ServerResponse) {
70+
let log = self.log
7071
let viewEngine = (get("view engine") as? String) ?? "mustache"
7172
guard let engine = engines[viewEngine] else {
72-
console.error("Did not find view engine: \(viewEngine)")
73+
log.error("Did not find view engine: \(viewEngine)")
7374
res.emit(error: ExpressRenderingError.unsupportedViewEngine(viewEngine))
7475
res.finishRender500IfNecessary()
7576
return
@@ -96,14 +97,14 @@ public extension Express {
9697
if let error = v0 {
9798
res.emit(error: ExpressRenderingError
9899
.templateError(error as? Swift.Error))
99-
console.error("template error:", error)
100+
log.error("template error:", error)
100101
res.writeHead(500)
101102
res.end()
102103
return
103104
}
104105

105106
guard let result = v1 else { // Hm?
106-
console.warn("template returned no content: \(template) \(results)")
107+
log.warn("template returned no content: \(template) \(results)")
107108
res.writeHead(204)
108109
res.end()
109110
return
@@ -112,7 +113,7 @@ public extension Express {
112113
// TBD: maybe support a stream as a result? (result.pipe(res))
113114
// Or generators, there are many more options.
114115
if !(result is String) {
115-
console.warn("template rendering result is not a String:", result)
116+
log.warn("template rendering result is not a String:", result)
116117
}
117118

118119
let s = (result as? String) ?? "\(result)"
@@ -137,7 +138,6 @@ public extension Express {
137138
}
138139
}
139140

140-
// ExExpress variant - TODO: make it async
141141
func lookupTemplatePath(_ template: String, in dir: String,
142142
preferredEngine: String? = nil,
143143
yield: @escaping ( String? ) -> Void)

0 commit comments

Comments
 (0)