X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Ffolders.go;h=5b3649e0fe9bb7e551bb813a3ac7d23de948c74f;hb=HEAD;hp=b0c198a3cfef5618f8e5e57775500f86b71807c5;hpb=285332c351777b74abca638b8b2a2cde3c68edc6;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go
index b0c198a..5b3649e 100644
--- 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");
@@ -26,10 +26,10 @@ import (
 	"strings"
 	"time"
 
+	common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	"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"
 )
 
@@ -51,8 +51,8 @@ type RegisteredCB struct {
 var fcMutex = sync.NewMutex()
 var ffMutex = sync.NewMutex()
 
-// FoldersNew Create a new instance of Model Folders
-func FoldersNew(ctx *Context) *Folders {
+// FoldersConstructor Create a new instance of Model Folders
+func FoldersConstructor(ctx *Context) *Folders {
 	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 {
-			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
@@ -177,7 +179,7 @@ func (f *Folders) ResolveID(id string) (string, error) {
 	} 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