Replace -v with -vv where necessary or change Debugf to Logf

This commit is contained in:
Nick Craig-Wood 2017-02-11 20:19:44 +00:00
parent 4d28b5ed22
commit 006227baed
3 changed files with 20 additions and 12 deletions

View File

@ -4,13 +4,18 @@ This is a short guide on how to contribute things to rclone.
## Reporting a bug ## ## Reporting a bug ##
Bug reports are welcome. Check your issue exists with the latest If you've just got a question or aren't sure if you've found a bug
version first. Please add when submitting: then please use the [rclone forum](https://forum.rclone.org/) instead
of filing an issue.
When filing an issue, please include the following information if
possible as well as a description of the problem. Make sure you test
with the [latest beta of rclone](http://beta.rclone.org/):
* Rclone version (eg output from `rclone -V`) * Rclone version (eg output from `rclone -V`)
* Which OS you are using and how many bits (eg Windows 7, 64 bit) * Which OS you are using and how many bits (eg Windows 7, 64 bit)
* The command you were trying to run (eg `rclone copy /tmp remote:tmp`) * The command you were trying to run (eg `rclone copy /tmp remote:tmp`)
* A log of the command with the `-v` flag (eg output from `rclone -v copy /tmp remote:tmp`) * A log of the command with the `-vv` flag (eg output from `rclone -vv copy /tmp remote:tmp`)
* if the log contains secrets then edit the file with a text editor first to obscure them * if the log contains secrets then edit the file with a text editor first to obscure them
## Submitting a pull request ## ## Submitting a pull request ##

View File

@ -1,6 +1,9 @@
When filing an issue, please include the following information if possible as well as a description of the problem. Make sure you test with the [latest beta of rclone](http://rclone.org/downloads/). When filing an issue, please include the following information if possible as well as a description of the problem. Make sure you test with the latest beta of rclone.
If you've just got a question then please use the [rclone forum](https://forum.rclone.org/) instead of filing an issue. http://beta.rclone.org/
http://rclone.org/downloads/
If you've just got a question or aren't sure if you've found a bug then please use the [rclone forum](https://forum.rclone.org/) instead of filing an issue.
> What is your rclone version (eg output from `rclone -V`) > What is your rclone version (eg output from `rclone -V`)
@ -10,5 +13,5 @@ If you've just got a question then please use the [rclone forum](https://forum.r
> The command you were trying to run (eg `rclone copy /tmp remote:tmp`) > The command you were trying to run (eg `rclone copy /tmp remote:tmp`)
> A log from the command with the `-v` flag (eg output from `rclone -v copy /tmp remote:tmp`) > A log from the command with the `-vv` flag (eg output from `rclone -vv copy /tmp remote:tmp`)

View File

@ -309,7 +309,7 @@ func (f *Fs) cleanRemote(name string) string {
if !utf8.ValidString(name) { if !utf8.ValidString(name) {
f.wmu.Lock() f.wmu.Lock()
if _, ok := f.warned[name]; !ok { if _, ok := f.warned[name]; !ok {
fs.Debugf(f, "Replacing invalid UTF-8 characters in %q", name) fs.Logf(f, "Replacing invalid UTF-8 characters in %q", name)
f.warned[name] = struct{}{} f.warned[name] = struct{}{}
} }
f.wmu.Unlock() f.wmu.Unlock()
@ -601,7 +601,7 @@ func (o *Object) Storable() bool {
// Check for control characters in the remote name and show non storable // Check for control characters in the remote name and show non storable
for _, c := range o.Remote() { for _, c := range o.Remote() {
if c >= 0x00 && c < 0x20 || c == 0x7F { if c >= 0x00 && c < 0x20 || c == 0x7F {
fs.Debugf(o.fs, "Can't store file with control characters: %q", o.Remote()) fs.Logf(o.fs, "Can't store file with control characters: %q", o.Remote())
return false return false
} }
} }
@ -612,10 +612,10 @@ func (o *Object) Storable() bool {
mode &^= os.ModeSymlink mode &^= os.ModeSymlink
} }
if mode&os.ModeSymlink != 0 { if mode&os.ModeSymlink != 0 {
fs.Debugf(o, "Can't follow symlink without -L/--copy-links") fs.Logf(o, "Can't follow symlink without -L/--copy-links")
return false return false
} else if mode&(os.ModeNamedPipe|os.ModeSocket|os.ModeDevice) != 0 { } else if mode&(os.ModeNamedPipe|os.ModeSocket|os.ModeDevice) != 0 {
fs.Debugf(o, "Can't transfer non file/directory") fs.Logf(o, "Can't transfer non file/directory")
return false return false
} else if mode&os.ModeDir != 0 { } else if mode&os.ModeDir != 0 {
// fs.Debugf(o, "Skipping directory") // fs.Debugf(o, "Skipping directory")
@ -714,7 +714,7 @@ func (o *Object) Update(in io.Reader, src fs.ObjectInfo) error {
err = closeErr err = closeErr
} }
if err != nil { if err != nil {
fs.Debugf(o, "Removing partially written file on error: %v", err) fs.Logf(o, "Removing partially written file on error: %v", err)
if removeErr := os.Remove(o.path); removeErr != nil { if removeErr := os.Remove(o.path); removeErr != nil {
fs.Errorf(o, "Failed to remove partially written file: %v", removeErr) fs.Errorf(o, "Failed to remove partially written file: %v", removeErr)
} }
@ -859,7 +859,7 @@ func cleanWindowsName(f *Fs, name string) string {
if name2 != original && f != nil { if name2 != original && f != nil {
f.wmu.Lock() f.wmu.Lock()
if _, ok := f.warned[name]; !ok { if _, ok := f.warned[name]; !ok {
fs.Debugf(f, "Replacing invalid characters in %q to %q", name, name2) fs.Logf(f, "Replacing invalid characters in %q to %q", name, name2)
f.warned[name] = struct{}{} f.warned[name] = struct{}{}
} }
f.wmu.Unlock() f.wmu.Unlock()