Archived
Reduce default verbosity now that the GUI is there
This commit is contained in:
Jakob Borg committed
1 parent
a1d575894a
commit
89c2f61b30
2 files changed
+29
-27
No files matched your search
+1
-1
@@ -3,4 +3,4 @@ package auto
|
||||
|
||||
import "github.com/cratonica/embed"
|
||||
|
||||
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xbc, 0xfd, 0xd9, 0x7f, 0xdb, 0xb8, 0xb2, 0x2f, 0x8e, 0xee, 0xfb, 0xaa, 0x87, 0xfb, 0x7a, 0x5f, 0x6d, 0x6e, 0x1f, 0x35, 0x19, 0xc1, 0xb2, 0x9d, 0xee, 0xbd, 0x6, 0xd2, 0x8c, 0x8e, 0xe3, 0x38, 0x53, 0xc7, 0x4e, 0x3a, 0x76, 0xd2, 0x83, 0xac, 0xee, 0x1f, 0x38, 0x68, 0x68, 0x8d, 0xd1, 0xe0, 0xc4, 0xb1, 0xf5, 0x7e, 0xff, 0xec, 0x5f, 0x7d, 0xb, 0x3, 0x41, 0x89, 0x4e, 0xaf, 0xb5, 0xcf, 0xfe, 0x9c, 0x1e, 0x2c, 0x12, 0x4, 0x1, 0x10, 0x28, 0x14, 0x6a, 0xae, 0xff, 0xef, 0x7f, 0xfc, 0xc7, 0x7f, 0xc8, 0x49, 0x6f, 0x35, 0x92, 0xf3, 0xe6, 0x78, 0x30, 0x69, 0xfe, 0xb9, 0xf8, 0xff, 0xfd, 0xff, 0xff, 0x3f, 0xff, 0x71, 0xf0, 0xa8, 0xb6, 0x73, 0xa2, 0x4a, 0x5f, 0x5f, 0xee, 0xdc, 0x1c, 0x35, 0x1f, 0x37, 0xff, 0x5e, 0xdb, 0xf1, 0xd3, 0x60, 0xe7, 0xf1, 0xe1, 0xd1, 0xe1, 0x3e, 0xfd, 0xf9, 0x61, 0xe7, 0xc5, 0x74, 0xda, 0x1b, 0xe5, 0x62, 0xe7, 0xd5, 0x24, 0x6d, 0xee, 0xf4, 0x97, 0xcb, 0x59, 0x78, 0x70, 0xa0, 0x5b, 0xfa, 0x73, 0xd1, 0x9c, 0xce, 0x7b, 0xb5, 0x9d, 0x37, 0x83, 0x34, 0x9f, 0x2c, 0xf2, 0x70, 0xe7, 0xfc, 0xd5, 0x55, 0xed, 0xd1, 0x41, 0xcd, 0xef, 0xae, 0x26, 0xe9, 0x72, 0x30, 0x9d, 0xf8, 0xbf, 0x89, 0x9f, 0xc4, 0x3c, 0xb8, 0xfb, 0x6e, 0xb5, 0xc8, 0x77, 0x16, 0xcb, 0xf9, 0x20, 0x5d, 0x7e, 0x17, 0x99, 0x87, 0x3b, 0xcf, 0xfd, 0x24, 0xb8, 0x9b, 0xe7, 0xcb, 0xd5, 0x7c, 0xb2, 0x63, 0xdf, 0x8, 0xee, 0x6e, 0xe4, 0x7c, 0x47, 0xc6, 0x72, 0xde, 0x5b, 0x8d, 0xf3, 0xc9, 0x72, 0xd1, 0x3e, 0xec, 0x88, 0x54, 0xc8, 0xd8, 0x6b, 0x7b, 0xd, 0x3f, 0x69, 0x25, 0xd, 0x2f, 0xa4, 0x7f, 0xbd, 0xa0, 0x21, 0x1b, 0x5e, 0xc7, 0xc, 0x28, 0x9f, 0xcf, 0xa7, 0xf3, 0x45, 0xb3, 0x34, 0xae, 0x3, 0xfe, 0x9c, 0x3, 0xf3, 0xd6, 0x81, 0x7e, 0x2b, 0xea, 0x4e, 0xe7, 0x7e, 0x1a, 0x1f, 0x45, 0xe9, 0xb1, 0xed, 0xa3, 0x39, 0xca, 0x27, 0xbd, 0x65, 0x3f, 0x4a, 0x1b, 0x8d, 0x80, 0xba, 0x6e, 0xf8, 0x47, 0x71, 0x9c, 0xb6, 0xbc, 0x16, 0xbd, 0x52, 0xa7, 0x77, 0xbc, 0x19, 0x35, 0x92, 0xee, 0x1f, 0xd1, 0x55, 0xec, 0x35, 0xf2, 0x49, 0x3a, 0xcd, 0xf2, 0xf, 0xef, 0x5f, 0x9d, 0x4e, 0xc7, 0xb3, 0xe9, 0x84, 0xde, 0xf7, 0x3d, 0x33, 0x7c, 0x2f, 0x8e, 0x97, 0xb7, 0xb3, 0x7c, 0xda, 0xdd, 0x29, 0xc6, 0x9f, 0x76, 0x5a, 0xee, 0x4d, 0x73, 0x39, 0xbd, 0xa4, 0x99, 0x98, 0xf4, 0xfc, 0xa0, 0x39, 0xcf, 0x67, 0x23, 0x99, 0xe6, 0xfe, 0xc1, 0xce, 0xf5, 0x5d, 0xfb, 0x7a, 0x71, 0x7d, 0xd9, 0x79, 0xb4, 0x77, 0x20, 0x68, 0x98, 0xa1, 0xb7, 0x9a, 0x64, 0x79, 0x77, 0x30, 0xc9, 0xb3, 0x7, 0x9a, 0x74, 0x2a, 0x84, 0xde, 0x82, 0x1b, 0xf4, 0x76, 0x2b, 0x6b, 0xbe, 0xbe, 0x7c, 0x7b, 0xd1, 0x54, 0x35, 0x6, 0xdd, 0x5b, 0xdf, 0x7d, 0x16, 0x84, 0xa5, 0xbb, 0x48, 0x2f, 0xc6, 0x19, 0x66, 0xd3, 0x97, 0xc1, 0x7a, 0x6d, 0xd7, 0xea, 0x53, 0x82, 0xc5, 0x1a, 0x74, 0xfd, 0xc9, 0x6a, 0x34, 0x8a, 0xe3, 0xe4, 0xfe, 0xfe, 0xab, 0xa4, 0x92, 0x40, 0xbd, 0xb1, 0x7b, 0x14, 0xa9, 0x55, 0xab, 0x25, 0x66, 0x2a, 0x75, 0x53, 0x34, 0x91, 0x71, 0xd2, 0x9c, 0xd0, 0x84, 0x5d, 0xd1, 0xd0, 0xea, 0x75, 0xd9, 0xda, 0x3d, 0xc, 0x9f, 0xd1, 0x9b, 0xf7, 0xf7, 0x3f, 0xf2, 0xdf, 0x43, 0xaa, 0x20, 0xef, 0xef, 0xbd, 0xc9, 0x6a, 0x9c, 0xe4, 0x73, 0xfa, 0x58, 0xfb, 0xd, 0xf5, 0xfa, 0xe1, 0x31, 0xfd, 0x91, 0xfb, 0x47, 0x3b, 0x83, 0xc9, 0x4e, 0xe2, 0x8c, 0xc5, 0x4f, 0x84, 0x14, 0xa9, 0x82, 0x94, 0x2c, 0xa2, 0x41, 0x25, 0x1, 0xfd, 0x79, 0x83, 0xf1, 0x60, 0x71, 0x33, 0xae, 0x1f, 0x78, 0xb3, 0xf9, 0x74, 0x39, 0x45, 0x6b, 0xd4, 0x6a, 0x76, 0x7f, 0xef, 0x7b, 0x6a, 0x68, 0xea, 0xce, 0x9b, 0xc8, 0xb1, 0x7e, 0x90, 0x34, 0xfb, 0x72, 0xf1, 0xf6, 0xf3, 0xe4, 0xdd, 0x7c, 0x3a, 0xcb, 0xe7, 0xcb, 0xdb, 0x7a, 0x7d, 0x77, 0xb3, 0xc8, 0xcf, 0x2, 0x1a, 0xab, 0x6c, 0xa6, 0x72, 0x34, 0xf2, 0x53, 0x91, 0xb4, 0xb3, 0x8e, 0xc8, 0x82, 0x28, 0x1f, 0x11, 0x5c, 0xa3, 0xff, 0x26, 0xf5, 0x7b, 0x26, 0xd3, 0x7e, 0xbd, 0x6e, 0x2f, 0x77, 0xe3, 0xf8, 0x53, 0x60, 0xef, 0x7c, 0xc, 0xd8, 0xd6, 0xe7, 0xd9, 0x54, 0x63, 0x8d, 0xf, 0xa3, 0xec, 0xd8, 0xce, 0x5a, 0x6, 0x0, 0xac, 0xec, 0xc5, 0xf9, 0xb0, 0x8a, 0xc1, 0xd1, 0x34, 0x6d, 0xbe, 0xa5, 0x17, 0xc0, 0x99, 0xb7, 0xb7, 0xbc, 0x86, 0x6a, 0xa1, 0xda, 0xb4, 0xa9, 0xd4, 0x4e, 0x78, 0xa0, 0xcd, 0x94, 0xdb, 0x9c, 0xad, 0x16, 0x7d, 0xba, 0x34, 0x8d, 0xc9, 0xe6, 0x62, 0x3a, 0x5f, 0xfa, 0x81, 0xd3, 0x66, 0x4a, 0x8b, 0x51, 0xe3, 0xd5, 0x40, 0x6b, 0xbc, 0x22, 0x31, 0x77, 0x24, 0x72, 0xfa, 0xb4, 0xfc, 0x38, 0x33, 0x9f, 0x96, 0x6f, 0x7c, 0x5a, 0x3b, 0xef, 0xd0, 0x38, 0xe9, 0xaf, 0x6d, 0x3d, 0x2b, 0x9a, 0x7d, 0x97, 0x54, 0xe1, 0x6, 0xee, 0x26, 0xa1, 0xd7, 0x4b, 0xa0, 0xf9, 0xab, 0xf4, 0x8b, 0xce, 0x93, 0x78, 0x28, 0x75, 0x8f, 0x42, 0x46, 0x49, 0x44, 0xf5, 0xf7, 0xf7, 0x23, 0x49, 0xa5, 0xed, 0xa4, 0xd3, 0x4c, 0xfb, 0x72, 0x7e, 0x4a, 0xb0, 0x78, 0xb2, 0xf4, 0xf, 0x3, 0x0, 0xce, 0x7f, 0xfd, 0x9d, 0xa0, 0x4f, 0x3, 0xf1, 0xe, 0xd7, 0x89, 0xbd, 0x13, 0x4f, 0x50, 0x1b, 0x7f, 0x4e, 0x7, 0x13, 0x9f, 0x76, 0x22, 0x6a, 0xfd, 0xf3, 0x10, 0xb5, 0xf4, 0xe3, 0x43, 0x4f, 0x2d, 0x48, 0xe9, 0x25, 0xb5, 0xa3, 0x9b, 0xdd, 0xf9, 0x74, 0x7c, 0xaa, 0xfb, 0xf0, 0x65, 0xe3, 0x28, 0x70, 0x5b, 0x5a, 0xd3, 0xf5, 0x6a, 0xb2, 0xe8, 0xf, 0xba, 0x84, 0x30, 0xe, 0x3d, 0xfb, 0xdLine truncated
|
||||
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xfd, 0x5b, 0x8c, 0x23, 0x59, 0xb7, 0x20, 0x4, 0xe7, 0x5c, 0xfe, 0x7f, 0xc0, 0x33, 0xdf, 0x9c, 0xa3, 0x19, 0x60, 0xe0, 0x85, 0x71, 0xc6, 0x97, 0xc7, 0x1d, 0x51, 0xde, 0xe9, 0x74, 0x56, 0xf7, 0x77, 0x8b, 0xc8, 0x28, 0x9f, 0xac, 0xac, 0xac, 0x5b, 0x57, 0x66, 0x55, 0x67, 0x66, 0x55, 0x5f, 0x9c, 0xee, 0x9e, 0x1d, 0x17, 0x5f, 0xda, 0x76, 0xd8, 0xe5, 0xb0, 0x33, 0x2b, 0x2b, 0x6d, 0x90, 0x78, 0x2, 0x21, 0xe6, 0x79, 0x74, 0x84, 0x84, 0x78, 0x82, 0x27, 0x84, 0xd0, 0x8, 0x1, 0x3, 0x6f, 0x20, 0x4, 0xcc, 0x3, 0xe2, 0x79, 0xc4, 0x3, 0x2, 0x9, 0xd0, 0x91, 0x6, 0x71, 0x91, 0x10, 0x67, 0x66, 0x60, 0xad, 0xb5, 0xaf, 0x11, 0x76, 0x56, 0x77, 0x9f, 0xf3, 0xcd, 0x79, 0x80, 0xca, 0xee, 0x28, 0x47, 0xec, 0xd8, 0xb1, 0xaf, 0x6b, 0xaf, 0xbd, 0xd6, 0xda, 0xeb, 0xf2, 0x3b, 0x5b, 0x5b, 0x5b, 0x8d, 0x41, 0x96, 0xa4, 0xef, 0x1a, 0xfd, 0xf9, 0x78, 0xd4, 0xc8, 0xaf, 0xa7, 0x5b, 0xbf, 0xbf, 0xb5, 0x15, 0x35, 0xdf, 0x3c, 0x3b, 0xa9, 0xfe, 0xaa, 0xf1, 0x19, 0xbc, 0xde, 0xfa, 0xdd, 0xad, 0xad, 0xe4, 0x5f, 0xf9, 0xfb, 0x67, 0x7f, 0xe1, 0xdf, 0xfd, 0xeb, 0x5b, 0xc9, 0xce, 0xd6, 0xd6, 0xf7, 0xd1, 0xd6, 0x8f, 0xfa, 0xfb, 0x3e, 0x9a, 0xcc, 0x7a, 0xbb, 0xe3, 0x68, 0xfa, 0x3, 0xf9, 0xfe, 0x85, 0xef, 0xa3, 0xbd, 0x7c, 0x16, 0xef, 0xf5, 0x6, 0xf3, 0xfe, 0x22, 0x6a, 0xc4, 0x93, 0xf1, 0x5e, 0xcc, 0x47, 0xe3, 0xfe, 0x5e, 0x7e, 0x93, 0xc5, 0xf3, 0xfe, 0x20, 0xeb, 0xed, 0xf5, 0x16, 0x83, 0x3d, 0xd3, 0xc8, 0xad, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0xfd, 0xf6, 0xfe, 0x7e, 0xb6, 0xf5, 0xe9, 0xfd, 0xfd, 0x26, 0xde, 0xfd, 0xdc, 0xd9, 0xae, 0xfe, 0xd5, 0xbf, 0xf2, 0xfa, 0xe3, 0x90, 0x7c, 0xfc, 0xfb, 0xf8, 0xf7, 0xf1, 0xef, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0xff, 0xa1, 0xbf, 0xf9, 0xf4, 0xcf, 0x6f, 0xfd, 0x8b, 0xf0, 0xfb, 0x67, 0xe5, 0x73, 0x47, 0xfe, 0xfe, 0x99, 0xd2, 0xef, 0x3f, 0xf8, 0xbf, 0xc5, 0xdf, 0xa1, 0x7c, 0xfe, 0xb6, 0xf4, 0xfe, 0x8f, 0xe4, 0xfb, 0xc7, 0xf2, 0xf9, 0xdf, 0x28, 0xbd, 0xff, 0x73, 0xf2, 0xf7, 0xaf, 0xc8, 0xdf, 0xff, 0xa1, 0xf4, 0xfe, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0xf1, 0xef, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0x8f, 0xef, 0x8f, 0x27, 0x5b, 0x5b, 0x19, 0xfc, 0xfe, 0x23, 0x64, 0xc4, 0x7f, 0xd7, 0xf0, 0xff, 0xff, 0xcb, 0xef, 0x6c, 0x6d, 0xfd, 0x5d, 0xb8, 0xfe, 0x33, 0xb8, 0xfe, 0x1d, 0xb8, 0xde, 0xc1, 0xb5, 0xf, 0xd7, 0x5f, 0x82, 0xeb, 0xf, 0xff, 0xf2, 0xd6, 0xd6, 0xbf, 0xd, 0xd7, 0xbf, 0x5, 0xd7, 0xdf, 0x84, 0xeb, 0x25, 0x5c, 0xbf, 0x82, 0xeb, 0x1e, 0x5c, 0xff, 0x2c, 0x5c, 0xff, 0xc, 0x5c, 0xbf, 0x3, 0xd7, 0xff, 0xf9, 0xb3, 0xad, 0xad, 0xff, 0xe, 0xae, 0xff, 0x1a, 0xae, 0x7f, 0x1f, 0xae, 0x3f, 0x80, 0xeb, 0x6f, 0xc1, 0xf5, 0x37, 0xe1, 0x5a, 0xc2, 0x35, 0x80, 0xeb, 0x39, 0x5c, 0x4f, 0xe1, 0x7a, 0x2, 0x57, 0x8, 0xd7, 0x5f, 0x83, 0xeb, 0x1f, 0xfe, 0xa5, 0xad, 0xad, 0x3f, 0x82, 0xeb, 0xff, 0x82, 0xeb, 0x7f, 0x84, 0xeb, 0xef, 0xc2, 0xf5, 0x5f, 0xc2, 0xf5, 0x5f, 0xc0, 0xf5, 0x4f, 0xc1, 0xf5, 0x8f, 0xfe, 0xe2, 0xd6, 0xd6, 0x3f, 0x80, 0xeb, 0x8f, 0xe0, 0xfa, 0x5f, 0xe1, 0xfa, 0x9f, 0xe1, 0xfa, 0x9f, 0xe0, 0xfa, 0x4f, 0xe1, 0xfa, 0xdb, 0x70, 0xfd, 0x2d, 0xb8, 0x6e, 0xe1, 0x7a, 0x6, 0x97, 0xf, 0xd7, 0x6f, 0xe0, 0xfa, 0xeb, 0x98, 0xbf, 0x2, 0xe9, 0x70, 0xfd, 0x73, 0x70, 0xfd, 0xe1, 0x3f, 0xb9, 0xb5, 0xf5, 0x9f, 0xc0, 0x15, 0xc0, 0xf5, 0xb7, 0xff, 0x9, 0xa8, 0x1f, 0xae, 0xbf, 0xf7, 0x17, 0xb6, 0xb6, 0xfe, 0x43, 0xb8, 0xfe, 0x0, 0xae, 0xdf, 0x85, 0xeb, 0xff, 0xf8, 0xff, 0x6f, 0x6d, 0xfd, 0xb7, 0x70, 0xfd, 0x57, 0x70, 0xfd, 0xc7, 0x70, 0xfd, 0x1d, 0xb8, 0xfe, 0x4d, 0xb8, 0x56, 0x70, 0x9d, 0xc2, 0xf5, 0xbf, 0xff, 0xff, 0xb6, 0xb6, 0xfe, 0x23, 0xb8, 0xfe, 0x0, 0xae, 0x6, 0x5c, 0x3f, 0x83, 0xeb, 0xef, 0xfc, 0xf9, 0xad, 0xad, 0x2f, 0xe1, 0xda, 0x83, 0xeb, 0x67, 0x70, 0xfd, 0xe1, 0x9f, 0xdb, 0xda, 0xfa, 0xd7, 0xe0, 0x1a, 0xc2, 0xf5, 0x1c, 0xae, 0x7f, 0x1a, 0xae, 0xff, 0xed, 0xcf, 0x6e, 0x6d, 0xfd, 0x37, 0x70, 0xfd, 0xeb, 0x70, 0xbd, 0x87, 0xeb, 0xf1, 0x9f, 0x15, 0xe3, 0xff, 0xf, 0xff, 0xd4, 0x85, 0x21, 0xd5, 0x1f, 0xf8, 0x3b, 0xc8, 0xa7, 0x3c, 0xab, 0x66, 0xbd, 0xdd, 0xbc, 0x3f, 0xb9, 0xe, 0x9d, 0x6c, 0x92, 0xa4, 0x47, 0xdd, 0x5e, 0xe3, 0x14, 0x7e, 0x9f, 0x3d, 0xaa, 0x6e, 0x87, 0xd5, 0xf1, 0xcd, 0xb3, 0x47, 0xce, 0x83, 0xf, 0x96, 0x73, 0x30, 0x4f, 0xaa, 0xf1, 0x88, 0xe7, 0x79, 0xe8, 0xcc, 0xd3, 0x77, 0xf3, 0xdd, 0xd9, 0xa0, 0xd7, 0x9f, 0xff, 0xd0, 0x37, 0x7b, 0xf3, 0xe4, 0xc1, 0xf, 0xb6, 0xee, 0xf6, 0x16, 0x1b, 0x74, 0x98, 0x24, 0x33, 0x57, 0xb6, 0xcc, 0x5b, 0xad, 0x7e, 0xa8, 0x2d, 0xbf, 0xbd, 0x8a, 0xdf, 0xa4, 0x7f, 0xda, 0xf5, 0x8a, 0xe9, 0xb0, 0x7, 0x73, 0x3c, 0xc9, 0x26, 0x90, 0x18, 0xa7, 0xce, 0x3, 0xd1, 0x28, 0x6b, 0x7a, 0x96, 0x55, 0x98, 0xb5, 0xd9, 0x7c, 0xb5, 0x3a, 0xd8, 0xc3, 0xef, 0x1e, 0xfc, 0xa9, 0xb4, 0xf0, 0x47, 0x54, 0xb5, 0xb1, 0x37, 0xbd, 0xd1, 0xcd, 0xb4, 0x3f, 0x88, 0x27, 0x59, 0x55, 0xdf, 0xed, 0x8a, 0x1e, 0x3d, 0x83, 0x5b, 0x6b, 0x9c, 0x9d, 0x7, 0xLine truncated
|
||||
@@ -33,10 +33,10 @@ var (
|
||||
|
||||
var (
|
||||
showVersion bool
|
||||
showConfig bool
|
||||
confDir string
|
||||
trace string
|
||||
profiler string
|
||||
verbose bool
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -44,10 +44,10 @@ func main() {
|
||||
logger = log.New(os.Stderr, "", log.Flags())
|
||||
|
||||
flag.StringVar(&confDir, "home", "~/.syncthing", "Set configuration directory")
|
||||
flag.BoolVar(&showConfig, "config", false, "Print current configuration")
|
||||
flag.StringVar(&trace, "debug.trace", "", "(connect,net,idx,file,pull)")
|
||||
flag.StringVar(&profiler, "debug.profiler", "", "(addr)")
|
||||
flag.BoolVar(&showVersion, "version", false, "Show version")
|
||||
flag.BoolVar(&verbose, "v", false, "Be more verbose")
|
||||
flag.Usage = usageFor(flag.CommandLine, "syncthing [options]")
|
||||
flag.Parse()
|
||||
|
||||
@@ -84,6 +84,9 @@ func main() {
|
||||
log.SetPrefix("[" + myID[0:5] + "] ")
|
||||
logger.SetPrefix("[" + myID[0:5] + "] ")
|
||||
|
||||
infoln("Version", Version)
|
||||
infoln("My ID:", myID)
|
||||
|
||||
// Prepare to be able to save configuration
|
||||
|
||||
cfgFile := path.Join(confDir, "config.xml")
|
||||
@@ -144,18 +147,7 @@ func main() {
|
||||
infof("Edit %s to taste or use the GUI\n", cfgFile)
|
||||
}
|
||||
|
||||
if showConfig {
|
||||
writeConfigXML(os.Stdout, cfg)
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
infoln("Version", Version)
|
||||
infoln("My ID:", myID)
|
||||
|
||||
var dir = expandTilde(cfg.Repositories[0].Directory)
|
||||
if len(dir) == 0 {
|
||||
fatalln("No repository directory. Set dir under [repository] in syncthing.ini.")
|
||||
}
|
||||
|
||||
if len(profiler) > 0 {
|
||||
go func() {
|
||||
@@ -206,29 +198,37 @@ func main() {
|
||||
// Walk the repository and update the local model before establishing any
|
||||
// connections to other nodes.
|
||||
|
||||
infoln("Populating repository index")
|
||||
if verbose {
|
||||
infoln("Populating repository index")
|
||||
}
|
||||
loadIndex(m)
|
||||
updateLocalModel(m)
|
||||
|
||||
// Routine to listen for incoming connections
|
||||
infoln("Listening for incoming connections")
|
||||
if verbose {
|
||||
infoln("Listening for incoming connections")
|
||||
}
|
||||
go listen(myID, cfg.Options.ListenAddress, m, tlsCfg)
|
||||
|
||||
// Routine to connect out to configured nodes
|
||||
infoln("Attempting to connect to other nodes")
|
||||
if verbose {
|
||||
infoln("Attempting to connect to other nodes")
|
||||
}
|
||||
go connect(myID, cfg.Options.ListenAddress, m, tlsCfg)
|
||||
|
||||
// Routine to pull blocks from other nodes to synchronize the local
|
||||
// repository. Does not run when we are in read only (publish only) mode.
|
||||
if !cfg.Options.ReadOnly {
|
||||
if cfg.Options.AllowDelete {
|
||||
infoln("Deletes from peer nodes are allowed")
|
||||
} else {
|
||||
infoln("Deletes from peer nodes will be ignored")
|
||||
if verbose {
|
||||
if cfg.Options.AllowDelete {
|
||||
infoln("Deletes from peer nodes are allowed")
|
||||
} else {
|
||||
infoln("Deletes from peer nodes will be ignored")
|
||||
}
|
||||
okln("Ready to synchronize (read-write)")
|
||||
}
|
||||
okln("Ready to synchronize (read-write)")
|
||||
m.StartRW(cfg.Options.AllowDelete, cfg.Options.ParallelRequests)
|
||||
} else {
|
||||
} else if verbose {
|
||||
okln("Ready to synchronize (read only; no external updates accepted)")
|
||||
}
|
||||
|
||||
@@ -244,8 +244,10 @@ func main() {
|
||||
}
|
||||
}()
|
||||
|
||||
// Periodically print statistics
|
||||
go printStatsLoop(m)
|
||||
if verbose {
|
||||
// Periodically print statistics
|
||||
go printStatsLoop(m)
|
||||
}
|
||||
|
||||
select {}
|
||||
}
|
||||
@@ -374,13 +376,13 @@ func connect(myID string, addr string, m *model.Model, tlsCfg *tls.Config) {
|
||||
|
||||
if !cfg.Options.LocalAnnEnabled {
|
||||
port = -1
|
||||
} else {
|
||||
} else if verbose {
|
||||
infoln("Sending local discovery announcements")
|
||||
}
|
||||
|
||||
if !cfg.Options.GlobalAnnEnabled {
|
||||
cfg.Options.GlobalAnnServer = ""
|
||||
} else {
|
||||
} else if verbose {
|
||||
infoln("Sending external discovery announcements")
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user