Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use go module as dependency tool instead of glide
[src/xds/xds-server.git]
/
lib
/
xdsserver
/
sdk.go
diff --git
a/lib/xdsserver/sdk.go
b/lib/xdsserver/sdk.go
index
6cd2619
..
cda334c
100644
(file)
--- a/
lib/xdsserver/sdk.go
+++ b/
lib/xdsserver/sdk.go
@@
-26,9
+26,9
@@
import (
"strings"
"time"
"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"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server
.git
/lib/xsapiv1"
"github.com/Sirupsen/logrus"
uuid "github.com/satori/go.uuid"
)
"github.com/Sirupsen/logrus"
uuid "github.com/satori/go.uuid"
)
@@
-268,7
+268,7
@@
func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Error
ln
("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Error
f
("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
// IO socket can be nil when disconnected
}
// IO socket can be nil when disconnected
@@
-305,11
+305,13
@@
func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
// Define callback for output
s.installCmd.ExitCB = func(e *eows.ExecOverWS, code int, exitError error) {
// Define callback for output
s.installCmd.ExitCB = func(e *eows.ExecOverWS, code int, exitError error) {
+ defer LockXdsUpdateCounter(s.Context, false)
+
// paranoia
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
// paranoia
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Error
ln
("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Error
f
("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
s.Log.Infof("Command SDK ID %s [Cmd ID %s] exited: code %d, exitError: %v", sdkID[:16], e.CmdID, code, exitError)
}
s.Log.Infof("Command SDK ID %s [Cmd ID %s] exited: code %d, exitError: %v", sdkID[:16], e.CmdID, code, exitError)