"os"
"os/exec"
"os/signal"
+ "path/filepath"
"strings"
"syscall"
"time"
}
ctx.Config = cfg
- // TODO allow to redirect stdout/sterr into logs file
- //logFilename := filepath.Join(ctx.Config.FileConf.LogsDir + "xds-server.log")
+ // Logs redirected into a file when logsDir is set
+ logfilename := cliCtx.GlobalString("logfile")
+ if ctx.Config.FileConf.LogsDir != "" && logfilename != "stdout" {
+ if logfilename == "" {
+ logfilename = "xds-server.log"
+ }
+ // is it an absolute path ?
+ logFile := logfilename
+ if logfilename[0] == '.' || logfilename[0] != '/' {
+ logFile = filepath.Join(ctx.Config.FileConf.LogsDir, logfilename)
+ }
+ fmt.Printf("Logging file: %s\n", logFile)
+ fdL, err := os.OpenFile(logFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0666)
+ if err != nil {
+ msgErr := fmt.Sprintf("Cannot create log file %s", logFile)
+ return cli.NewExitError(msgErr, int(syscall.EPERM))
+ }
+ ctx.Log.Out = fdL
+ }
// FIXME - add a builder interface and support other builder type (eg. native)
builderType := "syncthing"
// 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--
}
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.TrimRight(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})
}
Usage: "logging level (supported levels: panic, fatal, error, warn, info, debug)\n\t",
EnvVar: "LOG_LEVEL",
},
+ cli.StringFlag{
+ Name: "logfile",
+ Value: "stdout",
+ Usage: "filename where logs will be redirected (default stdout)\n\t",
+ EnvVar: "LOG_FILENAME",
+ },
}
// only one action: Web Server