Update Readme file

[src/xds/xds-server.git] / main.go

diff --git a/main.go b/main.go
index 69f6676..fd1480e 100644 (file)
--- a/main.go
+++ b/main.go
@@ -144,13 +144,14 @@ func xdsApp(cliCtx *cli.Context) error {
                // Establish connection with local Syncthing (retry if connection fail)
                fmt.Printf("Establishing connection with Syncthing...\n")
                time.Sleep(2 * time.Second)
-               retry := 10
+               maxRetry := 30
+               retry := maxRetry
                err = nil
                for retry > 0 {
                        if err = ctx.SThg.Connect(); err == nil {
                                break
                        }
-                       ctx.Log.Warningf("Establishing connection to Syncthing (retry %d/10)", retry)
+                       ctx.Log.Warningf("Establishing connection to Syncthing (retry %d/%d)", retry, maxRetry)
                        time.Sleep(time.Second)
                        retry--
                }
@@ -178,12 +179,16 @@ func xdsApp(cliCtx *cli.Context) error {
                        return cli.NewExitError(err, 2)
                }
                for _, stFld := range stCfg.Folders {
-                       relativePath := strings.TrimPrefix(stFld.RawPath, ctx.Config.ShareRootDir)
+                       relativePath := strings.TrimPrefix(stFld.RawPath, ctx.Config.FileConf.ShareRootDir)
                        if relativePath == "" {
                                relativePath = stFld.RawPath
                        }
 
-                       newFld := xdsconfig.NewFolderConfig(stFld.ID, stFld.Label, ctx.Config.ShareRootDir, strings.Trim(relativePath, "/"), defaultSdk)
+                       newFld := xdsconfig.NewFolderConfig(stFld.ID,
+                               stFld.Label,
+                               ctx.Config.FileConf.ShareRootDir,
+                               strings.TrimRight(relativePath, "/"),
+                               defaultSdk)
                        ctx.Config.Folders = ctx.Config.Folders.Update(xdsconfig.FoldersConfig{newFld})
                }