extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 01:44:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make logging more consistent

Browse Source
This commit is contained in:
Nick Craig-Wood 2012-11-28 17:12:22 +00:00
parent a49b8ca0b6
commit c42bafc4e2
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
swiftsync.go
View File

@ -42,18 +42,24 @@ type FsObject struct {
type FsObjects []FsObject type FsObjects []FsObject
// Write debuging output for this FsObject
func (fs *FsObject) Debugf(text string, args... interface{}) {
out := fmt.Sprintf(text, args...)
log.Printf("%s: %s", fs.rel, out)
}
// md5sum calculates the md5sum of a file returning a lowercase hex string // md5sum calculates the md5sum of a file returning a lowercase hex string
func md5sum(path string) (string, error) { func (fs *FsObject) md5sum() (string, error) {
in, err := os.Open(path) in, err := os.Open(fs.path)
if err != nil { if err != nil {
log.Printf("Failed to open %s: %s", path, err) fs.Debugf("Failed to open: %s", err)
return "", err return "", err
} }
defer in.Close() // FIXME ignoring error defer in.Close() // FIXME ignoring error
hash := md5.New() hash := md5.New()
_, err = io.Copy(hash, in) _, err = io.Copy(hash, in)
if err != nil { if err != nil {
log.Printf("Failed to read from %s: %s", path, err) fs.Debugf("Failed to read: %s", err)
return "", err return "", err
} }
return fmt.Sprintf("%x", hash.Sum(nil)), nil return fmt.Sprintf("%x", hash.Sum(nil)), nil
@ -70,34 +76,34 @@ func md5sum(path string) (string, error) {
func (fs *FsObject) changed(c *swift.Connection, container string) bool { func (fs *FsObject) changed(c *swift.Connection, container string) bool {
obj, h, err := c.Object(container, fs.rel) obj, h, err := c.Object(container, fs.rel)
if err != nil { if err != nil {
log.Printf("Failed to read info %s: %s", fs.rel, err) fs.Debugf("Failed to read info: %s", err)
return true return true
} }
if obj.Bytes != fs.info.Size() { if obj.Bytes != fs.info.Size() {
log.Printf("Sizes differ %s", fs.rel) fs.Debugf("Sizes differ")
return true return true
} }
m := h.ObjectMetadata() m := h.ObjectMetadata()
t, err := m.GetModTime() t, err := m.GetModTime()
if err != nil { if err != nil {
log.Printf("Failed to read mtime %s: %s", fs.rel, err) fs.Debugf("Failed to read mtime: %s", err)
localMd5, err := md5sum(fs.path) localMd5, err := fs.md5sum()
// log.Printf("Local MD5 %s", localMd5) // fs.Debugf("Local MD5 %s", localMd5)
// log.Printf("Remote MD5 %s", obj.Hash) // fs.Debugf("Remote MD5 %s", obj.Hash)
if err != nil { if err != nil {
log.Printf("Failed to calculate md5 %s: %s", fs.rel, err) fs.Debugf("Failed to calculate md5: %s", err)
return true return true
} }
if localMd5 != strings.ToLower(obj.Hash) { if localMd5 != strings.ToLower(obj.Hash) {
log.Printf("Md5sums differ %s", fs.rel) fs.Debugf("Md5sums differ")
return true return true
} }
log.Printf("Md5sums identical - skipping %s", fs.rel) fs.Debugf("Md5sums identical - skipping")
// FIXME update the mtime of the remote object here // FIXME update the mtime of the remote object here
return false return false
} }
if !t.Equal(fs.info.ModTime()) { if !t.Equal(fs.info.ModTime()) {
log.Printf("mtimes differ: %s", fs.rel) fs.Debugf("Modification times differ")
return true return true
} }
return false return false
@ -107,20 +113,20 @@ func (fs *FsObject) changed(c *swift.Connection, container string) bool {
func (fs *FsObject) put(c *swift.Connection, container string) { func (fs *FsObject) put(c *swift.Connection, container string) {
mode := fs.info.Mode() mode := fs.info.Mode()
if mode&(os.ModeSymlink|os.ModeNamedPipe|os.ModeSocket|os.ModeDevice) != 0 { if mode&(os.ModeSymlink|os.ModeNamedPipe|os.ModeSocket|os.ModeDevice) != 0 {
log.Printf("Can't transfer non file/directory %s", fs.rel) fs.Debugf("Can't transfer non file/directory")
} else if mode&os.ModeDir != 0 { } else if mode&os.ModeDir != 0 {
// Debug? // Debug?
log.Printf("FIXME Skipping directory %s", fs.rel) fs.Debugf("FIXME Skipping directory")
} else { } else {
// Check to see if changed or not // Check to see if changed or not
if !fs.changed(c, container) { if !fs.changed(c, container) {
log.Printf("Unchanged skipping %s", fs.rel) fs.Debugf("Unchanged skipping")
return return
} }
// FIXME content type // FIXME content type
in, err := os.Open(fs.path) in, err := os.Open(fs.path)
if err != nil { if err != nil {
log.Printf("Failed to open %s: %s", fs.rel, err) fs.Debugf("Failed to open: %s", err)
return return
} }
defer in.Close() defer in.Close()
@ -128,10 +134,10 @@ func (fs *FsObject) put(c *swift.Connection, container string) {
m.SetModTime(fs.info.ModTime()) m.SetModTime(fs.info.ModTime())
_, err = c.ObjectPut(container, fs.rel, in, true, "", "", m.ObjectHeaders()) _, err = c.ObjectPut(container, fs.rel, in, true, "", "", m.ObjectHeaders())
if err != nil { if err != nil {
log.Printf("Failed to upload %s: %s", fs.rel, err) fs.Debugf("Failed to upload: %s", err)
return return
} }
log.Printf("Uploaded %s", fs.rel) fs.Debugf("Uploaded")
} }
} }