github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-12-23 14:23:44 +01:00
Code Releases Activity

acd, onedrive: fix initialization order for token renewer - fixes #1442

Browse Source
This commit is contained in:
Nick Craig-Wood 2017-06-27 11:34:32 +01:00
parent d7811f72ad
commit 70b5b2f5c6
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
amazonclouddrive/amazonclouddrive.go
View File

@ -192,6 +192,12 @@ func NewFs(name, root string) (fs.Fs, error) {
} }
f.features = (&fs.Features{CaseInsensitive: true, ReadMimeType: true}).Fill(f) f.features = (&fs.Features{CaseInsensitive: true, ReadMimeType: true}).Fill(f)
// Renew the token in the background
f.tokenRenewer = oauthutil.NewRenew(f.String(), ts, func() error {
_, err := f.getRootInfo()
return err
})
// Update endpoints // Update endpoints
var resp *http.Response var resp *http.Response
err = f.pacer.Call(func() (bool, error) { err = f.pacer.Call(func() (bool, error) {
@ -209,12 +215,6 @@ func NewFs(name, root string) (fs.Fs, error) {
} }
f.trueRootID = *rootInfo.Id f.trueRootID = *rootInfo.Id
// Renew the token in the background
f.tokenRenewer = oauthutil.NewRenew(f.String(), ts, func() error {
_, err := f.getRootInfo()
return err
})
f.dirCache = dircache.New(root, f.trueRootID, f) f.dirCache = dircache.New(root, f.trueRootID, f)
// Find the current root // Find the current root

12
onedrive/onedrive.go
View File

@ -208,18 +208,18 @@ func NewFs(name, root string) (fs.Fs, error) {
f.features = (&fs.Features{CaseInsensitive: true, ReadMimeType: true}).Fill(f) f.features = (&fs.Features{CaseInsensitive: true, ReadMimeType: true}).Fill(f)
f.srv.SetErrorHandler(errorHandler) f.srv.SetErrorHandler(errorHandler)
// Get rootID
rootInfo, _, err := f.readMetaDataForPath("")
if err != nil || rootInfo.ID == "" {
return nil, errors.Wrap(err, "failed to get root")
}
// Renew the token in the background // Renew the token in the background
f.tokenRenewer = oauthutil.NewRenew(f.String(), ts, func() error { f.tokenRenewer = oauthutil.NewRenew(f.String(), ts, func() error {
_, _, err := f.readMetaDataForPath("") _, _, err := f.readMetaDataForPath("")
return err return err
}) })
// Get rootID
rootInfo, _, err := f.readMetaDataForPath("")
if err != nil || rootInfo.ID == "" {
return nil, errors.Wrap(err, "failed to get root")
}
f.dirCache = dircache.New(root, rootInfo.ID, f) f.dirCache = dircache.New(root, rootInfo.ID, f)
// Find the current root // Find the current root