SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go-bindata static files and templates

Browse Source
This commit is contained in:
emile
2015-09-11 19:25:49 +02:00
parent 7d4675f542
commit 95557a8dba
4 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
marathon.go
View File

@@ -138,14 +138,23 @@ func (provider *MarathonProvider) loadMarathonConfig() *Configuration {
}
gtf.Inject(MarathonFuncMap)
buf, err := Asset("providerTemplates/marathon.tmpl")
if err != nil {
log.Error("Error reading file", err)
}
tmpl, err := template.New(provider.Filename).Funcs(MarathonFuncMap).ParseFiles(string(buf))
if err != nil {
log.Error("Error reading file:", err)
return nil
tmpl := template.New(provider.Filename).Funcs(DockerFuncMap)
if(len(provider.Filename) > 0){
_, err := tmpl.ParseFiles(provider.Filename)
if err != nil {
log.Error("Error reading file", err)
return nil
}
}else{
buf, err := Asset("providerTemplates/marathon.tmpl")
if err != nil {
log.Error("Error reading file", err)
}
_, err = tmpl.Parse(string(buf))
if err != nil {
log.Error("Error reading file", err)
return nil
}
}
var buffer bytes.Buffer