Skip to content

Commit 102db76

Browse files
committed
minor updates
1 parent 8081138 commit 102db76

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

cmd/wsh/cmd/wshcmd-connserver.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ func askForJwtToken() (string, error) {
247247

248248
func serverRun(cmd *cobra.Command, args []string) error {
249249
var logFile *os.File
250-
logWriter := io.Writer(os.Stderr)
251250
if connServerDev {
252251
var err error
253252
logFile, err = os.OpenFile("/tmp/connserver.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
@@ -257,7 +256,7 @@ func serverRun(cmd *cobra.Command, args []string) error {
257256
log.SetPrefix(fmt.Sprintf("[PID:%d] ", os.Getpid()))
258257
} else {
259258
defer logFile.Close()
260-
logWriter = io.MultiWriter(os.Stderr, logFile)
259+
logWriter := io.MultiWriter(os.Stderr, logFile)
261260
log.SetOutput(logWriter)
262261
log.SetFlags(log.LstdFlags | log.Lmicroseconds)
263262
log.SetPrefix(fmt.Sprintf("[PID:%d] ", os.Getpid()))

cmd/wsh/cmd/wshcmd-root.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,10 @@ func setupRpcClient(serverImpl wshutil.ServerImpl, jwtToken string) error {
161161
if err != nil {
162162
return fmt.Errorf("error setting up domain socket rpc client: %v", err)
163163
}
164-
wshclient.AuthenticateCommand(RpcClient, jwtToken, &wshrpc.RpcOpts{Route: wshutil.ControlRoute})
164+
_, err = wshclient.AuthenticateCommand(RpcClient, jwtToken, &wshrpc.RpcOpts{Route: wshutil.ControlRoute})
165+
if err != nil {
166+
return fmt.Errorf("error authenticating: %v", err)
167+
}
165168
blockId := os.Getenv("WAVETERM_BLOCKID")
166169
if blockId != "" {
167170
peerInfo := fmt.Sprintf("domain:block:%s", blockId)

pkg/util/sigutil/sigusr1_notwindows.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package sigutil
77

88
import (
9+
"log"
910
"os"
1011
"os/signal"
1112
"syscall"
@@ -26,6 +27,7 @@ func InstallSIGUSR1Handler() {
2627
for range sigCh {
2728
file, err := os.Create(DumpFilePath)
2829
if err != nil {
30+
log.Printf("error creating dump file %q: %v", DumpFilePath, err)
2931
continue
3032
}
3133
utilfn.DumpGoRoutineStacks(file)

0 commit comments

Comments
 (0)