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
Use go module as dependency tool instead of glide
[src/xds/xds-agent.git]
/
lib
/
xdsconfig
/
configfile.go
diff --git
a/lib/xdsconfig/configfile.go
b/lib/xdsconfig/configfile.go
index
500c195
..
7ddb010
100644
(file)
--- a/
lib/xdsconfig/configfile.go
+++ b/
lib/xdsconfig/configfile.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");
@@
-22,7
+22,7
@@
import (
"os"
"path"
"os"
"path"
- common "g
ithub.com/iotbzh/xds-common/golib
"
+ common "g
errit.automotivelinux.org/gerrit/src/xds/xds-common.git
"
)
type SyncThingConf struct {
)
type SyncThingConf struct {
@@
-38,10
+38,20
@@
type XDSServerConf struct {
// private/not exported fields
ID string `json:"-"`
// private/not exported fields
ID string `json:"-"`
+ URLIndex string `json:"-"`
APIBaseURL string `json:"-"`
APIPartialURL string `json:"-"`
}
APIBaseURL string `json:"-"`
APIPartialURL string `json:"-"`
}
+type XDSBinderConf struct {
+ URL string `json:"url"`
+ ConnRetry int `json:"connRetry"`
+}
+
+type ProfileConfT struct {
+ XDSBinder XDSBinderConf `json:"xdsBinder"`
+}
+
type FileConfig struct {
HTTPPort string `json:"httpPort"`
WebAppDir string `json:"webAppDir"`
type FileConfig struct {
HTTPPort string `json:"httpPort"`
WebAppDir string `json:"webAppDir"`
@@
-49,6
+59,7
@@
type FileConfig struct {
XDSAPIKey string `json:"xds-apikey"`
ServersConf []XDSServerConf `json:"xdsServers"`
SThgConf *SyncThingConf `json:"syncthing"`
XDSAPIKey string `json:"xds-apikey"`
ServersConf []XDSServerConf `json:"xdsServers"`
SThgConf *SyncThingConf `json:"syncthing"`
+ ProfileConf ProfileConfT `json:"profileConf"`
}
// readGlobalConfig reads configuration from a config file.
}
// readGlobalConfig reads configuration from a config file.