Use go module as dependency tool instead of glide

[src/xds/xds-server.git] / lib / xdsserver / folders.go

diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go
index 93d2898..5b3649e 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");
@@ -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