summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-08-07 19:29:30 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-08-07 19:30:25 +0200
commit62e2996fcbcd704653d3043046c451fbc044918b (patch)
treea6c4cee646fae09559b4a5d56cc695c892e50ede
parent6efe2b8fc9aac7fdb9f33ae1c23c4fa6ede45a08 (diff)
Define cmdID as string.
-rw-r--r--golib/execPipeWs.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/golib/execPipeWs.go b/golib/execPipeWs.go
index 9bb4517..0537fe4 100644
--- a/golib/execPipeWs.go
+++ b/golib/execPipeWs.go
@@ -15,16 +15,16 @@ import (
)
// EmitOutputCB is the function callback used to emit data
-type EmitOutputCB func(sid string, cmdID int, stdout, stderr string, data *map[string]interface{})
+type EmitOutputCB func(sid string, cmdID string, stdout, stderr string, data *map[string]interface{})
// EmitExitCB is the function callback used to emit exit proc code
-type EmitExitCB func(sid string, cmdID int, code int, err error, data *map[string]interface{})
+type EmitExitCB func(sid string, cmdID string, code int, err error, data *map[string]interface{})
// Inspired by :
// https://github.com/gorilla/websocket/blob/master/examples/command/main.go
// ExecPipeWs executes a command and redirect stdout/stderr into a WebSocket
-func ExecPipeWs(cmd []string, env []string, so *socketio.Socket, sid string, cmdID int,
+func ExecPipeWs(cmd []string, env []string, so *socketio.Socket, sid string, cmdID string,
cmdExecTimeout int, log *logrus.Logger, eoCB EmitOutputCB, eeCB EmitExitCB, data *map[string]interface{}) error {
outr, outw, err := os.Pipe()
@@ -94,7 +94,7 @@ func ExecPipeWs(cmd []string, env []string, so *socketio.Socket, sid string, cmd
}
func cmdPumpStdin(so *socketio.Socket, w io.Writer, proc *os.Process,
- sid string, cmdID int, tmo int, log *logrus.Logger, exitFuncCB EmitExitCB,
+ sid string, cmdID string, tmo int, log *logrus.Logger, exitFuncCB EmitExitCB,
data *map[string]interface{}) {
/* XXX - code to add to support stdin through WS
for {
@@ -136,7 +136,7 @@ func cmdPumpStdin(so *socketio.Socket, w io.Writer, proc *os.Process,
}
func cmdPumpStdout(so *socketio.Socket, r io.Reader, done chan struct{},
- sid string, cmdID int, log *logrus.Logger, emitFuncCB EmitOutputCB, data *map[string]interface{}) {
+ sid string, cmdID string, log *logrus.Logger, emitFuncCB EmitOutputCB, data *map[string]interface{}) {
defer func() {
}()