feat(backend): fixed big file log in storage
This commit is contained in:
parent
22386cf59f
commit
19b6c896b9
2 changed files with 13 additions and 5 deletions
|
|
@ -45,7 +45,7 @@ func main() {
|
||||||
func(msg messages.Message) {
|
func(msg messages.Message) {
|
||||||
sesEnd := msg.(*messages.SessionEnd)
|
sesEnd := msg.(*messages.SessionEnd)
|
||||||
if err := srv.Upload(sesEnd); err != nil {
|
if err := srv.Upload(sesEnd); err != nil {
|
||||||
log.Printf("can't find session: %d", msg.SessionID())
|
log.Printf("upload session err: %s, sessID: %d", err, msg.SessionID())
|
||||||
sessionFinder.Find(msg.SessionID(), sesEnd.Timestamp)
|
sessionFinder.Find(msg.SessionID(), sesEnd.Timestamp)
|
||||||
}
|
}
|
||||||
// Log timestamp of last processed session
|
// Log timestamp of last processed session
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import (
|
||||||
"openreplay/backend/pkg/storage"
|
"openreplay/backend/pkg/storage"
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -105,22 +106,29 @@ func (s *Storage) Upload(msg *messages.SessionEnd) (err error) {
|
||||||
wg.Add(2)
|
wg.Add(2)
|
||||||
go func() {
|
go func() {
|
||||||
if prepErr := s.prepareSession(filePath, DOM, newTask); prepErr != nil {
|
if prepErr := s.prepareSession(filePath, DOM, newTask); prepErr != nil {
|
||||||
err = fmt.Errorf("prepare session err: %s", prepErr)
|
err = fmt.Errorf("prepareSession err: %s", prepErr)
|
||||||
}
|
}
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
go func() {
|
go func() {
|
||||||
if prepErr := s.prepareSession(filePath, DOM, newTask); prepErr != nil {
|
if prepErr := s.prepareSession(filePath, DEV, newTask); prepErr != nil {
|
||||||
err = fmt.Errorf("prepare session err: %s", prepErr)
|
err = fmt.Errorf("prepareSession err: %s", prepErr)
|
||||||
}
|
}
|
||||||
wg.Done()
|
wg.Done()
|
||||||
}()
|
}()
|
||||||
wg.Wait()
|
wg.Wait()
|
||||||
|
if err != nil {
|
||||||
|
if strings.Contains(err.Error(), "big file") {
|
||||||
|
log.Printf("%s, sess: %d", err, msg.SessionID())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
// Send new task to worker
|
// Send new task to worker
|
||||||
s.tasks <- newTask
|
s.tasks <- newTask
|
||||||
// Unload worker
|
// Unload worker
|
||||||
<-s.ready
|
<-s.ready
|
||||||
return err
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Storage) openSession(filePath string) ([]byte, error) {
|
func (s *Storage) openSession(filePath string) ([]byte, error) {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue