Skip to content

Commit be0f9b7

Browse files
committed
feat(serverHandler): escape special char for error log
1 parent a9be3ec commit be0f9b7

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

src/serverHandler/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func (h *handler) deleteItems(authUserName, fsPrefix string, files []string, ali
3333
}
3434

3535
if len(errs) > 0 {
36-
go h.logger.LogErrors(errs...)
36+
h.logErrors(errs...)
3737
return false
3838
}
3939

src/serverHandler/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
9090
// data
9191
data := h.getResponseData(r)
9292
if len(data.errors) > 0 {
93-
go h.logger.LogErrors(data.errors...)
93+
h.logErrors(data.errors...)
9494
}
9595
file := data.File
9696
if file != nil {

src/serverHandler/log.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,16 @@ func (h *handler) logArchive(filename, relPath string, r *http.Request) {
9595

9696
go h.logger.LogAccess(buf)
9797
}
98+
99+
func (h *handler) logErrors(errs ...error) {
100+
if !h.logger.CanLogError() {
101+
return
102+
}
103+
104+
go func(errs []error) {
105+
for i := range errs {
106+
errBytes := util.EscapeControllingRune(errs[i].Error())
107+
h.logger.LogError(errBytes)
108+
}
109+
}(errs)
110+
}

src/serverHandler/mkdir.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (h *handler) mkdirs(authUserName, fsPrefix string, files []string, aliasSub
4040
}
4141

4242
if len(errs) > 0 {
43-
go h.logger.LogErrors(errs...)
43+
h.logErrors(errs...)
4444
return false
4545
}
4646

src/serverHandler/upload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ func (h *handler) saveUploadFiles(authUserName, fsPrefix string, createDir, over
183183
}
184184

185185
if len(errs) > 0 {
186-
go h.logger.LogErrors(errs...)
186+
h.logErrors(errs...)
187187
return false
188188
}
189189

0 commit comments

Comments
 (0)