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
Unset LD_LIBRARY_PATH before executing commands (exec api)
[src/xds/xds-server.git]
/
lib
/
xdsserver
/
folders.go
diff --git
a/lib/xdsserver/folders.go
b/lib/xdsserver/folders.go
index
b0c198a
..
d27a329
100644
(file)
--- a/
lib/xdsserver/folders.go
+++ b/
lib/xdsserver/folders.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");
@@
-26,10
+26,10
@@
import (
"strings"
"time"
"strings"
"time"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
"github.com/franciscocpg/reflectme"
"github.com/franciscocpg/reflectme"
- common "github.com/iotbzh/xds-common/golib"
- "github.com/iotbzh/xds-server/lib/xdsconfig"
- "github.com/iotbzh/xds-server/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
"github.com/syncthing/syncthing/lib/sync"
)
@@
-51,8
+51,8
@@
type RegisteredCB struct {
var fcMutex = sync.NewMutex()
var ffMutex = sync.NewMutex()
var fcMutex = sync.NewMutex()
var ffMutex = sync.NewMutex()
-// Folders
New
Create a new instance of Model Folders
-func Folders
New
(ctx *Context) *Folders {
+// Folders
Constructor
Create a new instance of Model Folders
+func Folders
Constructor
(ctx *Context) *Folders {
file, _ := xdsconfig.FoldersConfigFilenameGet()
return &Folders{
Context: ctx,
file, _ := xdsconfig.FoldersConfigFilenameGet()
return &Folders{
Context: ctx,
@@
-74,7
+74,9
@@
func (f *Folders) LoadConfig() error {
f.Log.Infof("Use folder config file: %s", f.fileOnDisk)
err := foldersConfigRead(f.fileOnDisk, &flds)
if err != nil {
f.Log.Infof("Use folder config file: %s", f.fileOnDisk)
err := foldersConfigRead(f.fileOnDisk, &flds)
if err != nil {
- if strings.HasPrefix(err.Error(), "No folder config") {
+ if strings.HasPrefix(err.Error(), "EOF") {
+ f.Log.Warnf("Empty folder config file")
+ } else if strings.HasPrefix(err.Error(), "No folder config") {
f.Log.Warnf(err.Error())
} else {
return err
f.Log.Warnf(err.Error())
} else {
return err
@@
-177,7
+179,7
@@
func (f *Folders) ResolveID(id string) (string, error) {
} else if len(match) == 0 {
return id, fmt.Errorf("Unknown id")
}
} else if len(match) == 0 {
return id, fmt.Errorf("Unknown id")
}
- return id, fmt.Errorf("Multiple IDs found
with provided prefix: " + id
)
+ return id, fmt.Errorf("Multiple IDs found
%v", match
)
}
// Get returns the folder config or nil if not existing
}
// Get returns the folder config or nil if not existing