Skip to content

Commit d51043a

Browse files
committed
refactor(serverHandler/log): determine CanLogAccess before creating goroutine
1 parent 7fb20f6 commit d51043a

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

src/serverHandler/archive.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (h *handler) archive(
152152
pageData.Item != nil, // not empty root
153153
selections,
154154
func(f *os.File, fInfo os.FileInfo, relPath string) error {
155-
go h.logArchive(targetFilename, relPath, r)
155+
h.logArchive(targetFilename, relPath, r)
156156
err := cbWriteFile(f, fInfo, relPath)
157157
h.errHandler.LogError(err)
158158
return err

src/serverHandler/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ type handler struct {
6767
}
6868

6969
func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
70-
go h.logRequest(r)
70+
h.logRequest(r)
7171

7272
// hsts redirect
7373
if h.globalHsts && h.hsts(w, r) {

src/serverHandler/log.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func (h *handler) logRequest(r *http.Request) {
1717
buf = append(buf, ' ') // 1 byte
1818
buf = append(buf, []byte(r.RequestURI)...)
1919

20-
h.logger.LogAccess(buf)
20+
go h.logger.LogAccess(buf)
2121
}
2222

2323
func (h *handler) logMutate(username, action, detail string, r *http.Request) {
@@ -38,7 +38,7 @@ func (h *handler) logMutate(username, action, detail string, r *http.Request) {
3838
buf = append(buf, ':', ' ') // 2 bytes
3939
buf = append(buf, []byte(detail)...)
4040

41-
h.logger.LogAccess(buf)
41+
go h.logger.LogAccess(buf)
4242
}
4343

4444
func (h *handler) logUpload(username, filename, fsPath string, r *http.Request) {
@@ -59,7 +59,7 @@ func (h *handler) logUpload(username, filename, fsPath string, r *http.Request)
5959
buf = append(buf, []byte(" -> ")...) // 4 bytes
6060
buf = append(buf, []byte(fsPath)...)
6161

62-
h.logger.LogAccess(buf)
62+
go h.logger.LogAccess(buf)
6363
}
6464

6565
func (h *handler) logArchive(filename, relPath string, r *http.Request) {
@@ -75,5 +75,5 @@ func (h *handler) logArchive(filename, relPath string, r *http.Request) {
7575
buf = append(buf, []byte(" <- ")...) // 4 bytes
7676
buf = append(buf, []byte(relPath)...)
7777

78-
h.logger.LogAccess(buf)
78+
go h.logger.LogAccess(buf)
7979
}

src/serverHandler/upload.go

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

166166
fsPath := path.Clean(filePrefix + "/" + fsFilename)
167-
go h.logUpload(authUserName, filename, fsPath, r)
167+
h.logUpload(authUserName, filename, fsPath, r)
168168
file, err := os.OpenFile(fsPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
169169
if err != nil {
170170
errs = append(errs, err)

0 commit comments

Comments
 (0)