Merge branch 'develop'

This commit is contained in:
ErickSkrauch 2017-09-29 14:01:27 +03:00
commit 6e7a61f5f2
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E

View File

@ -114,15 +114,13 @@ func (db *redisDb) FindByUsername(username string) (*model.Skin, error) {
result, err := zlibDecode(encodedResult)
if err != nil {
log.Println("Cannot uncompress zlib for key " + redisKey) // TODO: replace with valid error
return nil, err
}
var skin *model.Skin
err = json.Unmarshal(result, &skin)
if err != nil {
log.Println("Cannot decode record data for key" + redisKey) // TODO: replace with valid error
return nil, nil
return nil, err
}
skin.OldUsername = skin.Username