Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc70e408

Browse files
committed
msg -> sprintf
1 parentceab625 commitc70e408

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎coderd/httpapi/httpapi.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ func Read(rw http.ResponseWriter, r *http.Request, value interface{}) bool {
118118

119119
constwebsocketCloseMaxLen=123
120120

121-
//WebsocketCloseMsg formats a websocket close message and ensures it is
121+
//WebsocketCloseSprintf formats a websocket close message and ensures it is
122122
// truncated to the maximum allowed length.
123-
funcWebsocketCloseMsg(formatstring,vars...any)string {
123+
funcWebsocketCloseSprintf(formatstring,vars...any)string {
124124
msg:=fmt.Sprintf(format,vars...)
125125

126126
// Cap msg length at 123 bytes. nhooyr/websocket only allows close messages

‎coderd/httpapi/httpapi_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ func WebsocketCloseMsg(t *testing.T) {
152152
t.Parallel()
153153

154154
msg:=strings.Repeat("d",255)
155-
trunc:=httpapi.WebsocketCloseMsg(msg)
155+
trunc:=httpapi.WebsocketCloseSprintf(msg)
156156
assert.LessOrEqual(t,len(trunc),123)
157157
})
158158

159159
t.Run("TruncateMultiByteCharacters",func(t*testing.T) {
160160
t.Parallel()
161161

162162
msg:=strings.Repeat("こんにちは",10)
163-
trunc:=httpapi.WebsocketCloseMsg(msg)
163+
trunc:=httpapi.WebsocketCloseSprintf(msg)
164164
assert.LessOrEqual(t,len(trunc),123)
165165
})
166166
}

‎coderd/provisionerdaemons.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (api *api) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request
5656
Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho,database.ProvisionerTypeTerraform},
5757
})
5858
iferr!=nil {
59-
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseMsg("insert provisioner daemon: %s",err))
59+
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseSprintf("insert provisioner daemon: %s",err))
6060
return
6161
}
6262

@@ -67,7 +67,7 @@ func (api *api) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request
6767
config.LogOutput=io.Discard
6868
session,err:=yamux.Server(websocket.NetConn(r.Context(),conn,websocket.MessageBinary),config)
6969
iferr!=nil {
70-
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseMsg("multiplex server: %s",err))
70+
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseSprintf("multiplex server: %s",err))
7171
return
7272
}
7373
mux:=drpcmux.New()
@@ -80,13 +80,13 @@ func (api *api) provisionerDaemonsListen(rw http.ResponseWriter, r *http.Request
8080
Logger:api.Logger.Named(fmt.Sprintf("provisionerd-%s",daemon.Name)),
8181
})
8282
iferr!=nil {
83-
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseMsg("drpc register provisioner daemon: %s",err))
83+
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseSprintf("drpc register provisioner daemon: %s",err))
8484
return
8585
}
8686
server:=drpcserver.New(mux)
8787
err=server.Serve(r.Context(),session)
8888
iferr!=nil {
89-
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseMsg("serve: %s",err))
89+
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseSprintf("serve: %s",err))
9090
return
9191
}
9292
_=conn.Close(websocket.StatusGoingAway,"")

‎coderd/workspaceresources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func (api *api) workspaceResourceDial(rw http.ResponseWriter, r *http.Request) {
108108
Pubsub:api.Pubsub,
109109
})
110110
iferr!=nil {
111-
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseMsg("serve: %s",err))
111+
_=conn.Close(websocket.StatusInternalError,httpapi.WebsocketCloseSprintf("serve: %s",err))
112112
return
113113
}
114114
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp