octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-09 14:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve log message consistency

Browse Source
This commit is contained in:
Jakob Borg 2013-12-30 15:27:46 -05:00
parent 7948d046d1
commit ec0489a8ea
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -115,8 +115,8 @@ Run syncthing to let it create it's config directory and certificate:
``` ```
$ syncthing $ syncthing
11:34:13 main.go:85: INFO: Version v0.1-40-gbb0fd87 11:34:13 main.go:85: INFO: Version v0.1-40-gbb0fd87
11:34:13 tls.go:61: OK: wrote cert.pem 11:34:13 tls.go:61: OK: Created TLS certificate file
11:34:13 tls.go:67: OK: wrote key.pem 11:34:13 tls.go:67: OK: Created TLS key file
11:34:13 main.go:66: INFO: My ID: NCTBZAAHXR6ZZP3D7SL3DLYFFQERMW4Q 11:34:13 main.go:66: INFO: My ID: NCTBZAAHXR6ZZP3D7SL3DLYFFQERMW4Q
11:34:13 main.go:90: FATAL: No config file 11:34:13 main.go:90: FATAL: No config file
``` ```
@ -159,8 +159,12 @@ $ syncthing --ro
13:30:59 main.go:247: INFO: Starting local discovery 13:30:59 main.go:247: INFO: Starting local discovery
13:30:59 main.go:165: OK: Ready to synchronize 13:30:59 main.go:165: OK: Ready to synchronize
13:31:04 discover.go:113: INFO: Discovered node CUGAE43Y5N64CRJU26YFH6MTWPSBLSUL at 172.16.32.24:22000 13:31:04 discover.go:113: INFO: Discovered node CUGAE43Y5N64CRJU26YFH6MTWPSBLSUL at 172.16.32.24:22000
13:31:14 main.go:296: OK: Connected to node CUGAE43Y5N64CRJU26YFH6MTWPSBLSUL 13:31:14 main.go:296: INFO: Connected to node CUGAE43Y5N64CRJU26YFH6MTWPSBLSUL
13:31:19 main.go:345: INFO: Transferred 139 KiB in (14 KiB/s), 139 KiB out (14 KiB/s) 13:31:19 main.go:345: INFO: Transferred 139 KiB in (14 KiB/s), 139 KiB out (14 KiB/s)
13:32:20 model.go:94: INFO: CUGAE43Y5N64CRJU26YFH6MTWPSBLSUL: 263.4 KB/s in, 69.1 KB/s out
13:32:20 model.go:104: INFO: 18289 files, 24.24 GB in cluster
13:32:20 model.go:111: INFO: 17132 files, 22.39 GB in local repo
13:32:20 model.go:117: INFO: 1157 files, 1.84 GB to synchronize
... ...
``` ```
You should see the synchronization start and then finish a short while You should see the synchronization start and then finish a short while

4
main.go
View File

@ -216,7 +216,7 @@ listen:
if nodeID == remoteID { if nodeID == remoteID {
nc := protocol.NewConnection(remoteID, conn, conn, m) nc := protocol.NewConnection(remoteID, conn, conn, m)
m.AddNode(nc) m.AddNode(nc)
okln("Connected to nodeID", remoteID, "(in)") infoln("Connected to node", remoteID, "(in)")
continue listen continue listen
} }
} }
@ -287,7 +287,7 @@ func connect(myID string, addr string, nodeAddrs map[string][]string, m *Model,
nc := protocol.NewConnection(nodeID, conn, conn, m) nc := protocol.NewConnection(nodeID, conn, conn, m)
m.AddNode(nc) m.AddNode(nc)
okln("Connected to node", remoteID, "(out)") infoln("Connected to node", remoteID, "(out)")
continue nextNode continue nextNode
} }
} }

4
model.go
View File

@ -199,9 +199,7 @@ func (m *Model) Close(node string) {
m.Lock() m.Lock()
defer m.Unlock() defer m.Unlock()
if opts.Debug.TraceNet { infoln("Disconnected from node", node)
debugf("NET CLOSE: %s", node)
}
delete(m.remote, node) delete(m.remote, node)
delete(m.nodes, node) delete(m.nodes, node)

2
model_puller.go
View File

@ -110,7 +110,7 @@ func (m *Model) pullFile(name string) error {
err = hashCheck(tmpFilename, globalFile.Blocks) err = hashCheck(tmpFilename, globalFile.Blocks)
if err != nil { if err != nil {
return fmt.Errorf("%s: %s", path.Base(name), err.Error()) return fmt.Errorf("%s: %s (deleting)", path.Base(name), err.Error())
} }
err = os.Chtimes(tmpFilename, time.Unix(globalFile.Modified, 0), time.Unix(globalFile.Modified, 0)) err = os.Chtimes(tmpFilename, time.Unix(globalFile.Modified, 0), time.Unix(globalFile.Modified, 0))

4
tls.go
View File

@ -58,11 +58,11 @@ func newCertificate(dir string) {
fatalErr(err) fatalErr(err)
pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}) pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
certOut.Close() certOut.Close()
okln("wrote cert.pem") okln("Created TLS certificate file")
keyOut, err := os.OpenFile(path.Join(dir, "key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) keyOut, err := os.OpenFile(path.Join(dir, "key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
fatalErr(err) fatalErr(err)
pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}) pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
keyOut.Close() keyOut.Close()
okln("wrote key.pem") okln("Created TLS key file")
} }