simon987/ws_bucket
1
0
Fork 0
mirror of https://github.com/simon987/ws_bucket.git synced 2025-04-19 18:26:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove panic()s

Browse Source
This commit is contained in:
simon987 2019-03-10 09:45:43 -04:00
parent b095c92cfd
commit b611c4d1cf
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/slot.go
View File

@ -18,6 +18,9 @@ var upgrader = websocket.FastHTTPUpgrader{
ReadBufferSize: WsBufferSize, ReadBufferSize: WsBufferSize,
WriteBufferSize: WsBufferSize, WriteBufferSize: WsBufferSize,
EnableCompression: true, EnableCompression: true,
CheckOrigin: func(ctx *fasthttp.RequestCtx) bool {
return true
},
} }
func (api *WebApi) AllocateUploadSlot(ctx *fasthttp.RequestCtx) { func (api *WebApi) AllocateUploadSlot(ctx *fasthttp.RequestCtx) {
@ -79,7 +82,10 @@ func (api *WebApi) Upload(ctx *fasthttp.RequestCtx) {
mt, reader, err := ws.NextReader() mt, reader, err := ws.NextReader()
if err != nil { if err != nil {
panic(err) logrus.WithFields(logrus.Fields{
"token": token,
}).Warning("Client disconnected before sending the first byte")
return
} }
if mt != websocket.BinaryMessage { if mt != websocket.BinaryMessage {
return return
@ -90,7 +96,7 @@ func (api *WebApi) Upload(ctx *fasthttp.RequestCtx) {
path := filepath.Join(WorkDir, slot.FileName) path := filepath.Join(WorkDir, slot.FileName)
fp, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600) fp, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
if err != nil { if err != nil {
panic(err) logrus.WithError(err).Error("Error while opening file for writing")
} }
buf := make([]byte, WsBufferSize) buf := make([]byte, WsBufferSize)
@ -108,8 +114,6 @@ func (api *WebApi) Upload(ctx *fasthttp.RequestCtx) {
_, _ = fp.Write(buf[:toWrite]) _, _ = fp.Write(buf[:toWrite])
if err == io.EOF { if err == io.EOF {
break break
} else if err != nil {
panic(err)
} }
totalRead += int64(read) totalRead += int64(read)
} }
@ -119,12 +123,12 @@ func (api *WebApi) Upload(ctx *fasthttp.RequestCtx) {
}).Info("Finished reading") }).Info("Finished reading")
err = fp.Close() err = fp.Close()
if err != nil { if err != nil {
panic(err) logrus.WithError(err).Error("Error while closing file")
} }
mu.(*sync.RWMutex).Unlock() mu.(*sync.RWMutex).Unlock()
}) })
if err != nil { if err != nil {
panic(err) logrus.WithError(err).Error("Error while upgrading connexion")
} }
} }
@ -153,7 +157,9 @@ func (api *WebApi) ReadUploadSlot(ctx *fasthttp.RequestCtx) {
mu.(*sync.RWMutex).RLock() mu.(*sync.RWMutex).RLock()
fp, err := os.OpenFile(path, os.O_RDONLY, 0600) fp, err := os.OpenFile(path, os.O_RDONLY, 0600)
if err != nil { if err != nil {
panic(err) logrus.WithError(err).Error("Error while opening file for reading")
mu.(*sync.RWMutex).RUnlock()
return
} }
buf := make([]byte, WsBufferSize) buf := make([]byte, WsBufferSize)
@ -164,13 +170,10 @@ func (api *WebApi) ReadUploadSlot(ctx *fasthttp.RequestCtx) {
if err == io.EOF { if err == io.EOF {
break break
} }
if err != nil {
panic(err)
}
} }
err = fp.Close() err = fp.Close()
if err != nil { if err != nil {
panic(err) logrus.WithError(err).Error("Error while closing file for reading")
} }
mu.(*sync.RWMutex).RUnlock() mu.(*sync.RWMutex).RUnlock()
} }