Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update/fix rpm and deb packaging
[src/xds/xds-agent.git]
/
lib
/
syncthing
/
st.go
diff --git
a/lib/syncthing/st.go
b/lib/syncthing/st.go
index
ac1e99d
..
3e07605
100644
(file)
--- a/
lib/syncthing/st.go
+++ b/
lib/syncthing/st.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");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-33,9
+33,9
@@
import (
"os/exec"
"os/exec"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
"github.com/Sirupsen/logrus"
"github.com/Sirupsen/logrus"
- "github.com/iotbzh/xds-agent/lib/xdsconfig"
- common "github.com/iotbzh/xds-common/golib"
"github.com/syncthing/syncthing/lib/config"
)
"github.com/syncthing/syncthing/lib/config"
)
@@
-188,7
+188,7
@@
func (s *SyncThing) startProc(exeName string, args []string, env []string, eChan
cmdOut, err := cmd.StdoutPipe()
if err != nil {
cmdOut, err := cmd.StdoutPipe()
if err != nil {
- return nil, fmt.Errorf("Pipe stdout error for : %
s
", err)
+ return nil, fmt.Errorf("Pipe stdout error for : %
v
", err)
}
go io.Copy(outfile, cmdOut)
}
go io.Copy(outfile, cmdOut)
@@
-278,7
+278,7
@@
func (s *SyncThing) Start() (*exec.Cmd, error) {
*/
s.STCmd, err = s.startProc("syncthing", args, env, &s.exitSTChan)
*/
s.STCmd, err = s.startProc("syncthing", args, env, &s.exitSTChan)
- // Use autogenerated apikey if not set by config.json
+ // Use autogenerated apikey if not set by
agent-
config.json
if err == nil && s.APIKey == "" {
if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
defer fd.Close()
if err == nil && s.APIKey == "" {
if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
defer fd.Close()