Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

Commit

Permalink
Reconnect on closed connection
Browse files Browse the repository at this point in the history
  • Loading branch information
jbygdell committed Feb 9, 2023
1 parent 0f8cb6a commit ef183ce
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 8 deletions.
5 changes: 5 additions & 0 deletions messenger.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type Event struct {
// Messenger is an interface for sending messages for different file events
type Messenger interface {
SendMessage(string, []byte) error
IsConnClosed() bool
}

// AMQPMessenger is a Messenger that sends messages to a local AMQP broker
Expand Down Expand Up @@ -157,3 +158,7 @@ func (m *AMQPMessenger) createNewChannel() error {

return nil
}

func (m *AMQPMessenger) IsConnClosed() bool {
return m.connection.IsClosed()
}
29 changes: 21 additions & 8 deletions proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,28 @@ func (p *Proxy) allowedResponse(w http.ResponseWriter, r *http.Request) {
return
}

if err = p.messenger.SendMessage(p.fileIds[r.URL.Path], jsonMessage); err != nil {
log.Debug("error when sending message")
log.Error(err)
}
switch p.messenger.IsConnClosed() {
case true:
log.Errorln("connection is closed")
w.WriteHeader(http.StatusServiceUnavailable)

tlsBroker, _ := TLSConfigBroker(Conf)
m, err := NewAMQPMessenger(Conf.Broker, tlsBroker)
if err == nil {
p.messenger = m
}

log.Debugf("marking file %v as 'uploaded' in database", p.fileIds[r.URL.Path])
err = p.database.MarkFileAsUploaded(p.fileIds[r.URL.Path], username, string(jsonMessage))
if err != nil {
log.Error(err)
case false:
if err = p.messenger.SendMessage(p.fileIds[r.URL.Path], jsonMessage); err != nil {
log.Debug("error when sending message")
log.Error(err)
}

log.Debugf("marking file %v as 'uploaded' in database", p.fileIds[r.URL.Path])
err = p.database.MarkFileAsUploaded(p.fileIds[r.URL.Path], username, string(jsonMessage))
if err != nil {
log.Error(err)
}
}

delete(p.fileIds, r.URL.Path)
Expand Down

0 comments on commit ef183ce

Please sign in to comment.