Skip to content

Add server shutdown to close listeners on migration exit #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dnovitski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add server shutdown to close listeners on migration exit #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go/logic/migrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ func (mgtr *Migrator) Migrate() (err error) {
return err
}
defer mgtr.server.RemoveSocketFile()
defer mgtr.server.Close()

if err := mgtr.countTableRows(); err != nil {
return err
Expand Down Expand Up @@ -740,6 +741,7 @@ func (mgtr *Migrator) Revert() error {
return err
}
defer mgtr.server.RemoveSocketFile()
defer mgtr.server.Close()
if err := mgtr.addDMLEventsListener(); err != nil {
return err
}
Expand Down
14 changes: 12 additions & 2 deletions go/logic/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (srv *Server) Serve() (err error) {
for {
conn, err := srv.unixListener.Accept()
if err != nil {
srv.migrationContext.Log.Errore(err)
return
}
go srv.handleConnection(conn)
}
Expand All @@ -159,7 +159,7 @@ func (srv *Server) Serve() (err error) {
for {
conn, err := srv.tcpListener.Accept()
if err != nil {
srv.migrationContext.Log.Errore(err)
return
}
go srv.handleConnection(conn)
}
Expand All @@ -168,6 +168,16 @@ func (srv *Server) Serve() (err error) {
return nil
}

// Close shuts down the server listeners
func (srv *Server) Close() {
if srv.unixListener != nil {
srv.unixListener.Close()
}
if srv.tcpListener != nil {
srv.tcpListener.Close()
}
}

func (srv *Server) handleConnection(conn net.Conn) (err error) {
if conn != nil {
defer conn.Close()
Expand Down
Loading