mirror of
https://github.com/samsonjs/retrogit.git
synced 2026-04-27 15:07:43 +00:00
Unify Account initialization code paths.
We were not initializing the timezone when loading all accounts, which was making the cron job fail.
This commit is contained in:
parent
faf41a425d
commit
c4e55c5553
1 changed files with 12 additions and 7 deletions
|
|
@ -29,21 +29,27 @@ func getAccount(c appengine.Context, gitHubUserId int) (*Account, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
r := bytes.NewBuffer(account.OAuthTokenSerialized)
|
err = initAccount(account)
|
||||||
err = gob.NewDecoder(r).Decode(&account.OAuthToken)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
return account, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func initAccount(account *Account) error {
|
||||||
|
r := bytes.NewBuffer(account.OAuthTokenSerialized)
|
||||||
|
err := gob.NewDecoder(r).Decode(&account.OAuthToken)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
if len(account.TimezoneName) == 0 {
|
if len(account.TimezoneName) == 0 {
|
||||||
account.TimezoneName = "America/Los_Angeles"
|
account.TimezoneName = "America/Los_Angeles"
|
||||||
}
|
}
|
||||||
account.TimezoneLocation, err = time.LoadLocation(account.TimezoneName)
|
account.TimezoneLocation, err = time.LoadLocation(account.TimezoneName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
return account, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func getAllAccounts(c appengine.Context, accounts *[]Account) error {
|
func getAllAccounts(c appengine.Context, accounts *[]Account) error {
|
||||||
|
|
@ -53,8 +59,7 @@ func getAllAccounts(c appengine.Context, accounts *[]Account) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for i, _ := range *accounts {
|
for i, _ := range *accounts {
|
||||||
r := bytes.NewBuffer((*accounts)[i].OAuthTokenSerialized)
|
err = initAccount(&(*accounts)[i])
|
||||||
err = gob.NewDecoder(r).Decode(&(*accounts)[i].OAuthToken)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue