forked from cwtch.im/cwtch
Merge branch 'ebf201903251154' of cwtch.im/cwtch into master
This commit is contained in:
commit
3671d91287
|
@ -54,13 +54,10 @@ func (ss *streamStore) initBuffer() {
|
||||||
func (ss *streamStore) initBufferFromStorage() error {
|
func (ss *streamStore) initBufferFromStorage() error {
|
||||||
filename := fmt.Sprintf("%s.%d", ss.filenameBase, 0)
|
filename := fmt.Sprintf("%s.%d", ss.filenameBase, 0)
|
||||||
|
|
||||||
bytes, err := readEncryptedFile(ss.storeDirectory, filename, ss.password)
|
bytes, _ := readEncryptedFile(ss.storeDirectory, filename, ss.password)
|
||||||
if err != nil {
|
|
||||||
log.Debugf("Failed to read encrypted file: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
msgs := []model.Message{}
|
msgs := []model.Message{}
|
||||||
err = json.Unmarshal([]byte(bytes), &msgs)
|
err := json.Unmarshal([]byte(bytes), &msgs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Debugf("failed to init buffer from storage: %v", err)
|
log.Debugf("failed to init buffer from storage: %v", err)
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue