Merge pull request #777 from github/ggunson-panic-message

Shlomi Noach · web-flow · commit cc3caffe67e8 · 2019-08-13T08:41:03.000+03:00
Changing the panic message
diff --git a/go/logic/server.go b/go/logic/server.go
@@ -341,7 +341,7 @@ help                                 # This message
 				err := fmt.Errorf("User commanded 'panic' on %s, but migrated table is %s; ignoring request.", arg, this.migrationContext.OriginalTableName)
 				return NoPrintStatusRule, err
 			}
-			err := fmt.Errorf("User commanded 'panic'. I will now panic, without cleanup. PANIC!")
+			err := fmt.Errorf("User commanded 'panic'. The migration will be aborted without cleanup. Please drop the gh-ost tables before trying again.")
 			this.migrationContext.PanicAbort <- err
 			return NoPrintStatusRule, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ help # This message`
`341`	`341`	`err := fmt.Errorf("User commanded 'panic' on %s, but migrated table is %s; ignoring request.", arg, this.migrationContext.OriginalTableName)`
`342`	`342`	`return NoPrintStatusRule, err`
`343`	`343`	`}`
`344`		`- err := fmt.Errorf("User commanded 'panic'. I will now panic, without cleanup. PANIC!")`
	`344`	`+ err := fmt.Errorf("User commanded 'panic'. The migration will be aborted without cleanup. Please drop the gh-ost tables before trying again.")`
`345`	`345`	`this.migrationContext.PanicAbort <- err`
`346`	`346`	`return NoPrintStatusRule, err`
`347`	`347`	`}`