mirror of
https://github.com/sorenisanerd/gotty.git
synced 2024-11-09 23:34:26 +00:00
For the brevity of the code, I changed the print format of arguments.
This commit is contained in:
parent
9224e98568
commit
9c203ef201
@ -98,17 +98,13 @@ func (wt *WebTTY) Run(ctx context.Context) error {
|
|||||||
errs <- func() error {
|
errs <- func() error {
|
||||||
buffer := make([]byte, wt.bufferSize)
|
buffer := make([]byte, wt.bufferSize)
|
||||||
var line string
|
var line string
|
||||||
arguments, err := json.Marshal(wt.arguments)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
for {
|
for {
|
||||||
n, err := wt.masterConn.Read(buffer)
|
n, err := wt.masterConn.Read(buffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return ErrMasterClosed
|
return ErrMasterClosed
|
||||||
}
|
}
|
||||||
|
|
||||||
err = wt.handleMasterReadEvent(buffer[:n], &line, arguments)
|
err = wt.handleMasterReadEvent(buffer[:n], &line)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -177,7 +173,7 @@ func (wt *WebTTY) masterWrite(data []byte) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (wt *WebTTY) handleMasterReadEvent(data []byte, line *string, argument []byte) error {
|
func (wt *WebTTY) handleMasterReadEvent(data []byte, line *string) error {
|
||||||
if len(data) == 0 {
|
if len(data) == 0 {
|
||||||
return errors.New("unexpected zero length read from master")
|
return errors.New("unexpected zero length read from master")
|
||||||
}
|
}
|
||||||
@ -203,7 +199,7 @@ func (wt *WebTTY) handleMasterReadEvent(data []byte, line *string, argument []by
|
|||||||
// 13(ASCII) means carriage return(CR)
|
// 13(ASCII) means carriage return(CR)
|
||||||
// it is the end of a line
|
// it is the end of a line
|
||||||
if decodedBuffer[n-1] == 13 {
|
if decodedBuffer[n-1] == 13 {
|
||||||
log.Printf("[write-log] %s %s\n", argument, *line)
|
log.Printf("[write-log] %v %s\n", wt.arguments, *line)
|
||||||
*line = ""
|
*line = ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user