Use go module as dependency tool instead of glide

[src/xds/xds-agent.git] / lib / agent / apiv1-exec.go

diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go
index 5fdfb9d..e711a19 100644 (file)
--- a/lib/agent/apiv1-exec.go
+++ b/lib/agent/apiv1-exec.go
@@ -1,13 +1,30 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
        "net/http"
 
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+       "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"
 )
 
@@ -64,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 {
@@ -98,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)
@@ -168,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())