Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

capture stderr from runner process. new packet format to distinguish it from real packets. warn when the runner exits

Browse Source
This commit is contained in:
sawka 2022-06-15 16:27:22 -07:00
parent f8f3ce65fb
commit 0c1cacc20d
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/main-server.go
View File

@ -16,6 +16,7 @@ import (
"github.com/scripthaus-dev/sh2-runner/pkg/base" "github.com/scripthaus-dev/sh2-runner/pkg/base"
"github.com/scripthaus-dev/sh2-runner/pkg/packet" "github.com/scripthaus-dev/sh2-runner/pkg/packet"
"github.com/scripthaus-dev/sh2-runner/pkg/shexec"
"github.com/scripthaus-dev/sh2-server/pkg/sstore" "github.com/scripthaus-dev/sh2-server/pkg/sstore"
"github.com/scripthaus-dev/sh2-server/pkg/wsshell" "github.com/scripthaus-dev/sh2-server/pkg/wsshell"
) )
@ -38,6 +39,8 @@ type RunnerProc struct {
Input *packet.PacketSender Input *packet.PacketSender
Output chan packet.PacketType Output chan packet.PacketType
WsConnMap map[string]*WsConnType WsConnMap map[string]*WsConnType
IsLocal bool
DoneCh chan bool
} }
func (rp *RunnerProc) AddWsConn(ws *WsConnType) { func (rp *RunnerProc) AddWsConn(ws *WsConnType) {
@ -278,11 +281,18 @@ func LaunchRunnerProc() (*RunnerProc, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
ecmd.Stderr = nil // /dev/null ecmd.Stderr = ecmd.Stdout // /dev/null
ecmd.Start() ecmd.Start()
rtn := &RunnerProc{Lock: &sync.Mutex{}, Cmd: ecmd, WsConnMap: make(map[string]*WsConnType)} rtn := &RunnerProc{Lock: &sync.Mutex{}, IsLocal: true, Cmd: ecmd, WsConnMap: make(map[string]*WsConnType)}
rtn.Output = packet.PacketParser(outputReader) rtn.Output = packet.PacketParser(outputReader)
rtn.Input = packet.MakePacketSender(inputWriter) rtn.Input = packet.MakePacketSender(inputWriter)
rtn.DoneCh = make(chan bool)
go func() {
exitErr := ecmd.Wait()
exitCode := shexec.GetExitCode(exitErr)
fmt.Printf("[error] RUNNER PROC EXITED code[%d]\n", exitCode)
close(rtn.DoneCh)
}()
return rtn, nil return rtn, nil
} }
@ -312,7 +322,6 @@ func (runner *RunnerProc) ProcessPackets() {
dataPacket := pk.(*packet.CmdDataPacketType) dataPacket := pk.(*packet.CmdDataPacketType)
runner.ForwardDataPacket(dataPacket) runner.ForwardDataPacket(dataPacket)
fmt.Printf("cmd-data %s/%s pty=%d run=%d\n", dataPacket.SessionId, dataPacket.CmdId, len(dataPacket.PtyData), len(dataPacket.RunData)) fmt.Printf("cmd-data %s/%s pty=%d run=%d\n", dataPacket.SessionId, dataPacket.CmdId, len(dataPacket.PtyData), len(dataPacket.RunData))
continue continue
} }
if pk.GetType() == packet.RunnerInitPacketStr { if pk.GetType() == packet.RunnerInitPacketStr {
@ -320,8 +329,17 @@ func (runner *RunnerProc) ProcessPackets() {
fmt.Printf("runner-init %s\n", initPacket.ScHomeDir) fmt.Printf("runner-init %s\n", initPacket.ScHomeDir)
continue continue
} }
if pk.GetType() == packet.MessagePacketStr {
msgPacket := pk.(*packet.MessagePacketType)
fmt.Printf("# %s\n", msgPacket.Message)
continue
}
if pk.GetType() == packet.RawPacketStr {
rawPacket := pk.(*packet.RawPacketType)
fmt.Printf("stderr> %s\n", rawPacket.Data)
continue
}
fmt.Printf("runner-packet: %v\n", pk) fmt.Printf("runner-packet: %v\n", pk)
} }
} }