status-im
/
migrate
mirror of https://github.com/status-im/migrate.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #81 from uzimonkey/master 

Release OS signals when you're finished with them.
This commit is contained in:
Matthias Kadenbach 2016-12-21 20:32:53 -08:00 committed by GitHub
parent b94dd6fc29 7f9f7e5978
commit cb2fa36c8b
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
migrate/migrate.go
View File

@ -34,11 +34,14 @@ func Up(pipe chan interface{}, url, migrationsPath string) {
return return
} }
signals := handleInterrupts()
defer signal.Stop(signals)
if len(applyMigrationFiles) > 0 { if len(applyMigrationFiles) > 0 {
for _, f := range applyMigrationFiles { for _, f := range applyMigrationFiles {
pipe1 := pipep.New() pipe1 := pipep.New()
go d.Migrate(f, pipe1) go d.Migrate(f, pipe1)
if ok := pipep.WaitAndRedirect(pipe1, pipe, handleInterrupts()); !ok { if ok := pipep.WaitAndRedirect(pipe1, pipe, signals); !ok {
break break
} }
} }
@ -81,11 +84,14 @@ func Down(pipe chan interface{}, url, migrationsPath string) {
return return
} }
signals := handleInterrupts()
defer signal.Stop(signals)
if len(applyMigrationFiles) > 0 { if len(applyMigrationFiles) > 0 {
for _, f := range applyMigrationFiles { for _, f := range applyMigrationFiles {
pipe1 := pipep.New() pipe1 := pipep.New()
go d.Migrate(f, pipe1) go d.Migrate(f, pipe1)
if ok := pipep.WaitAndRedirect(pipe1, pipe, handleInterrupts()); !ok { if ok := pipep.WaitAndRedirect(pipe1, pipe, signals); !ok {
break break
} }
} }
@ -115,7 +121,11 @@ func DownSync(url, migrationsPath string) (err []error, ok bool) {
func Redo(pipe chan interface{}, url, migrationsPath string) { func Redo(pipe chan interface{}, url, migrationsPath string) {
pipe1 := pipep.New() pipe1 := pipep.New()
go Migrate(pipe1, url, migrationsPath, -1) go Migrate(pipe1, url, migrationsPath, -1)
if ok := pipep.WaitAndRedirect(pipe1, pipe, handleInterrupts()); !ok {
signals := handleInterrupts()
defer signal.Stop(signals)
if ok := pipep.WaitAndRedirect(pipe1, pipe, signals); !ok {
go pipep.Close(pipe, nil) go pipep.Close(pipe, nil)
return return
} else { } else {
@ -135,7 +145,11 @@ func RedoSync(url, migrationsPath string) (err []error, ok bool) {
func Reset(pipe chan interface{}, url, migrationsPath string) { func Reset(pipe chan interface{}, url, migrationsPath string) {
pipe1 := pipep.New() pipe1 := pipep.New()
go Down(pipe1, url, migrationsPath) go Down(pipe1, url, migrationsPath)
if ok := pipep.WaitAndRedirect(pipe1, pipe, handleInterrupts()); !ok {
signals := handleInterrupts()
defer signal.Stop(signals)
if ok := pipep.WaitAndRedirect(pipe1, pipe, signals); !ok {
go pipep.Close(pipe, nil) go pipep.Close(pipe, nil)
return return
} else { } else {
@ -168,11 +182,14 @@ func Migrate(pipe chan interface{}, url, migrationsPath string, relativeN int) {
return return
} }
signals := handleInterrupts()
defer signal.Stop(signals)
if len(applyMigrationFiles) > 0 && relativeN != 0 { if len(applyMigrationFiles) > 0 && relativeN != 0 {
for _, f := range applyMigrationFiles { for _, f := range applyMigrationFiles {
pipe1 := pipep.New() pipe1 := pipep.New()
go d.Migrate(f, pipe1) go d.Migrate(f, pipe1)
if ok := pipep.WaitAndRedirect(pipe1, pipe, handleInterrupts()); !ok { if ok := pipep.WaitAndRedirect(pipe1, pipe, signals); !ok {
break break
} }
} }