X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fapiv1-exec.go;h=327c4c5656a52c1a3627e8220f512c05dff9e3d7;hb=65e09e831cf13343ac713fbf15281174d1f13a94;hp=bc45fdbd881de57c7c60c4bb02c708183089fc7e;hpb=963931e04d44a5b40d38817163f52f56241a9f33;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go
index bc45fdb..327c4c5 100644
--- a/lib/xdsserver/apiv1-exec.go
+++ b/lib/xdsserver/apiv1-exec.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
 	"github.com/gin-gonic/gin"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-common/golib/eows"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	"github.com/kr/pty"
 )
 
@@ -136,6 +136,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 	// Create new execution over WS context
 	execWS := eows.New(strings.Join(cmd, " "), cmdArgs, sop, sess.ID, args.CmdID)
 	execWS.Log = s.Log
+	execWS.OutSplit = eows.SplitChar
 
 	// Append client project dir to environment
 	execWS.Env = append(args.Env, "CLIENT_PROJECT_DIR="+prj.ClientPath)
@@ -180,7 +181,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 		// IO socket can be nil when disconnected
 		so := s.sessions.IOSocketGet(e.Sid)
 		if so == nil {
-			s.Log.Infof("%s not emitted: WS closed (sid:%s, msgid:%s)", xsapiv1.ExecOutEvent, e.Sid, e.CmdID)
+			s.Log.Infof("%s not emitted: WS closed (sid:%s, CmdID:%s)", xsapiv1.ExecOutEvent, e.Sid, e.CmdID)
 			return
 		}