X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fapiv1-exec.go;h=d74269323bd3619474d869b33518c533b532ec16;hb=4695ce02620407a5074125eaa5b257dd0e73758a;hp=2f38b63db58b75bdda76312e172a8398f4fd16ba;hpb=82ede02a56e12026b2dfb1baeacabfbd564006b1;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go
index 2f38b63..d742693 100644
--- a/lib/agent/apiv1-exec.go
+++ b/lib/agent/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");
@@ -20,11 +20,11 @@ package agent
 import (
 	"net/http"
 
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"github.com/franciscocpg/reflectme"
 	"github.com/gin-gonic/gin"
-	"github.com/iotbzh/xds-agent/lib/xaapiv1"
-	common "github.com/iotbzh/xds-common/golib"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
 	uuid "github.com/satori/go.uuid"
 )
 
@@ -81,9 +81,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 	for _, evName := range evtInList {
 		evN := evName
 		err := (*sock).On(evN, func(stdin string) {
-			if s.LogLevelSilly {
-				s.Log.Debugf("EXEC EVENT IN (%s) <<%v>>", evN, stdin)
-			}
+			s.LogSillyf("EXEC EVENT IN (%s) <<%v>>", evN, stdin)
 			svr.EventEmit(evN, stdin)
 		})
 		if err != nil {
@@ -115,9 +113,7 @@ func (s *APIService) execCmd(c *gin.Context) {
 			// Add sessionID to event Data
 			reflectme.SetField(evData, "sessionID", sid)
 
-			if s.LogLevelSilly {
-				s.Log.Debugf("EXEC EVENT OUT (%s) <<%v>>", evN, evData)
-			}
+			s.LogSillyf("EXEC EVENT OUT (%s) <<%v>>", evN, evData)
 
 			// Forward event to Client/Dashboard
 			(*so).Emit(evN, evData)
@@ -185,17 +181,18 @@ func (s *APIService) execCmd(c *gin.Context) {
 	// Forward back command to right server
 	res := xsapiv1.ExecResult{}
 	xsArgs := &xsapiv1.ExecArgs{
-		ID:              args.ID,
-		SdkID:           args.SdkID,
-		CmdID:           args.CmdID,
-		Cmd:             args.Cmd,
-		Args:            args.Args,
-		Env:             args.Env,
-		RPath:           args.RPath,
-		TTY:             args.TTY,
-		TTYGdbserverFix: args.TTYGdbserverFix,
-		ExitImmediate:   args.ExitImmediate,
-		CmdTimeout:      args.CmdTimeout,
+		ID:               args.ID,
+		SdkID:            args.SdkID,
+		CmdID:            args.CmdID,
+		Cmd:              args.Cmd,
+		Args:             args.Args,
+		Env:              args.Env,
+		RPath:            args.RPath,
+		TTY:              args.TTY,
+		TTYGdbserverFix:  args.TTYGdbserverFix,
+		LdLibPathNoReset: args.LdLibPathNoReset,
+		ExitImmediate:    args.ExitImmediate,
+		CmdTimeout:       args.CmdTimeout,
 	}
 	if err := svr.CommandExec(xsArgs, &res); err != nil {
 		common.APIError(c, err.Error())