octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove pointless -v option

Browse Source
This commit is contained in:
Jakob Borg 2014-03-31 06:47:08 +02:00
parent dddf563105
commit aaf0604601
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/syncthing/main.go
View File

@ -33,7 +33,6 @@ var (
var ( var (
showVersion bool showVersion bool
confDir string confDir string
verbose bool
) )
const ( const (
@ -63,7 +62,6 @@ const (
func main() { func main() {
flag.StringVar(&confDir, "home", getDefaultConfDir(), "Set configuration directory") flag.StringVar(&confDir, "home", getDefaultConfDir(), "Set configuration directory")
flag.BoolVar(&showVersion, "version", false, "Show version") flag.BoolVar(&showVersion, "version", false, "Show version")
flag.BoolVar(&verbose, "v", false, "Be more verbose")
flag.Usage = usageFor(flag.CommandLine, usage, extraUsage) flag.Usage = usageFor(flag.CommandLine, usage, extraUsage)
flag.Parse() flag.Parse()
@ -230,9 +228,7 @@ func main() {
// Walk the repository and update the local model before establishing any // Walk the repository and update the local model before establishing any
// connections to other nodes. // connections to other nodes.
if verbose {
infoln("Populating repository index") infoln("Populating repository index")
}
m.LoadIndexes(confDir) m.LoadIndexes(confDir)
m.ScanRepos() m.ScanRepos()
m.SaveIndexes(confDir) m.SaveIndexes(confDir)
@ -244,23 +240,16 @@ func main() {
} }
// Routine to connect out to configured nodes // Routine to connect out to configured nodes
if verbose {
infoln("Attempting to connect to other nodes")
}
disc := discovery() disc := discovery()
go listenConnect(myID, disc, m, tlsCfg, connOpts) go listenConnect(myID, disc, m, tlsCfg, connOpts)
// Routine to pull blocks from other nodes to synchronize the local // Routine to pull blocks from other nodes to synchronize the local
// repository. Does not run when we are in read only (publish only) mode. // repository. Does not run when we are in read only (publish only) mode.
if cfg.Options.ReadOnly { if cfg.Options.ReadOnly {
if verbose {
okln("Ready to synchronize (read only; no external updates accepted)") okln("Ready to synchronize (read only; no external updates accepted)")
}
m.StartRO() m.StartRO()
} else { } else {
if verbose {
okln("Ready to synchronize (read-write)") okln("Ready to synchronize (read-write)")
}
m.StartRW(cfg.Options.ParallelRequests) m.StartRW(cfg.Options.ParallelRequests)
} }
@ -444,7 +433,7 @@ func discovery() *discover.Discoverer {
if !cfg.Options.GlobalAnnEnabled { if !cfg.Options.GlobalAnnEnabled {
cfg.Options.GlobalAnnServer = "" cfg.Options.GlobalAnnServer = ""
} else if verbose { } else {
infoln("Sending external discovery announcements") infoln("Sending external discovery announcements")
} }