if sigAbort listener thread is off, enable & handle notifications

sources/GciSession.cls

@@ -155,6 +155,9 @@ debugToFilePath: aString
 	^library gciDbgEstablishToFile: aString
 !
 
+enableSignaledAbortError
+	self executeString: 'System enableSignaledAbortError'!
+
 eventCount
 
 	^eventCount.
@@ -789,6 +792,7 @@ valueOfOop: anOopType
 !GciSession categoriesFor: #commit!Jade convenience!public! !
 !GciSession categoriesFor: #debugString:fromContext:environment:!long running!public! !
 !GciSession categoriesFor: #debugToFilePath:!Jade convenience!public! !
+!GciSession categoriesFor: #enableSignaledAbortError!public! !
 !GciSession categoriesFor: #eventCount!public! !
 !GciSession categoriesFor: #fetchBytes:!private! !
 !GciSession categoriesFor: #forceLogout!Jade!public! !

sources/Rowan UI Base.pax

@@ -117,6 +117,7 @@ package methodNames
 	add: #GciSession -> #postLoginAs:useSocket:;
 	add: #GciSession -> #preferencesFile;
 	add: #GciSession -> #serverPerform:withArguments:;
+	add: #GciSession -> #shouldHandleTransactionBacklogError:;
 	add: #GciSession -> #terminate:;
 	add: #GciSession -> #titleBarFor:;
 	add: #GciSession -> #verifyRowanLoaded;
@@ -213,6 +214,7 @@ package methodNames
 	add: #JadePresenter -> #displayNoMods:;
 	add: #JadePresenter -> #displayUncompilableSourceIn:;
 	add: #JadePresenter -> #editSaveMethod:in:category:;
+	add: #JadePresenter -> #enableSigAbortError;
 	add: #JadePresenter -> #executeSelectionOrLine:;
 	add: #JadePresenter -> #flipAutoCommit;
 	add: #JadePresenter -> #insertCompileErrorText:into:;
@@ -1097,8 +1099,13 @@ handleTransactionBacklogError: error
 	JadePresenter sigAbortsProcessEnabled
 		ifTrue: [JadePresenter abortTransactionInSession: self]
 		ifFalse: 
-			[MessageBox
-				notify: 'Your session has been requested to abort, by a transaction backlog error (#3007) while executing a GCI command when not in transaction.  You must abort your transaction and retry the operation.'].
+			[
+			[(MessageBox
+				confirm: 'Your session has been requested to abort, by a transaction backlog error (#3007 or #6009) while executing a GCI command when not in transaction.
+You must abort your transaction before retrying the operation.
+Would you like to abort now?')
+					ifTrue: [JadePresenter abortTransactionInSession: self]]
+					ensure: [self enableSignaledAbortError	"must reenable each time a sig abort error is received"]].
 	error abort	"Shutdown this process. An abort happened or needs to happen"!
 
 hasServer
@@ -1225,6 +1232,10 @@ serverPerform: aSymbol withArguments: anArray
 				withAll: anArray.
 	^answer!
 
+shouldHandleTransactionBacklogError: result
+	^(result isKindOf: GsError)
+		and: [result errorReport number = 3007 or: [result errorReport number = 6009]]!
+
 terminate: anOopType
 	[self serverPerform: #terminate: with: anOopType] on: Error
 		do: 
@@ -1270,10 +1281,14 @@ withExplanation: aString do: aBlock
 			[
 			[(Delay forMilliseconds: 10) wait.
 			self isCallInProgress] whileTrue: [].
+			[library gciPollForSignal] on: Error
+				do: [:ex | (self shouldHandleTransactionBacklogError: ex) ifTrue: [self handleTransactionBacklogError: ex]].
 			result := self withExplanation: aString doA: aBlock.
 			self incrementEventCount.
 			(result isKindOf: GsError)
-				ifTrue: [result errorReport number = 3007 ifTrue: [self handleTransactionBacklogError: result]]
+				ifTrue: 
+					[(self shouldHandleTransactionBacklogError: result)
+						ifTrue: [self handleTransactionBacklogError: result]]
 				ifFalse: [^result].
 			error := result.
 			[result := error signal] ensure: [self releaseAllOops].
@@ -1318,6 +1333,7 @@ withExplanation: aString doA: aBlock
 !GciSession categoriesFor: #postLoginAs:useSocket:!private! !
 !GciSession categoriesFor: #preferencesFile!constants!private! !
 !GciSession categoriesFor: #serverPerform:withArguments:!Jade convenience!public! !
+!GciSession categoriesFor: #shouldHandleTransactionBacklogError:!long running!private!testing! !
 !GciSession categoriesFor: #terminate:!public! !
 !GciSession categoriesFor: #titleBarFor:!public!title bar! !
 !GciSession categoriesFor: #verifyRowanLoaded!private! !
@@ -2299,6 +2315,9 @@ editSaveMethod: classService in: methodSourcePresenter category: category
 			self setCompileWarningColor.
 			self statusBarText: warning].!
 
+enableSigAbortError
+	gciSession enableSignaledAbortError!
+
 executeSelectionOrLine: contextObject
 	| answeringService answer oop |
 	oop := (contextObject isKindOf: ExternalInteger)
@@ -2329,7 +2348,10 @@ issueCommand: service
 	^self class issueCommand: service session: self gciSession!
 
 listenForSigAborts: session
-	self sigAbortsProcessEnabled ifFalse: [^self].
+	self sigAbortsProcessEnabled
+		ifFalse: 
+			[self transactionMode == #manualBegin ifTrue: [self enableSigAbortError].
+			^self].
 	self
 		sigAbortsProcess: (
 			[
@@ -2339,7 +2361,7 @@ listenForSigAborts: session
 					session isValidSession
 						ifTrue: 
 							[gciSession gciAbort.	"to guarantee an abort gets done and doesn't get interrupted by another gci error do this"
-							self abortTransaction ."Yes, the second abort is redundant but this will also do some more complicated browser updating."
+							self abortTransaction.	"Yes, the second abort is redundant but this will also do some more complicated browser updating."
 							self class setInTransaction: RowanAnsweringService new session: session]].
 			(Delay forSeconds: self sigAbortProcessInterval) wait]
 					repeat]
@@ -2485,6 +2507,7 @@ updateServices: services
 !JadePresenter categoriesFor: #displayNoMods:!compile support!displaying!public! !
 !JadePresenter categoriesFor: #displayUncompilableSourceIn:!event handlers!public!text tabs!updating! !
 !JadePresenter categoriesFor: #editSaveMethod:in:category:!compile support!public! !
+!JadePresenter categoriesFor: #enableSigAbortError!accessing!public!transaction management! !
 !JadePresenter categoriesFor: #executeSelectionOrLine:!menu handlers!private! !
 !JadePresenter categoriesFor: #flipAutoCommit!menu handlers!public! !
 !JadePresenter categoriesFor: #insertCompileErrorText:into:!compile support!public! !