Fix up config setting for killing states on gateway failure. Enable this option where gw_down_kill_states is set. Flip setting accordingly during config upgrade to not use confusing 'kill_states' tag to not kill states. Ticket #5815

1 files changed, 14 insertions, 3 deletions

diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 8c2b837..5a5425d 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -3330,9 +3330,8 @@ function upgrade_096_to_097() {
 }
 
 function upgrade_097_to_098() {
-	global $config, $g;
-	/* Disable kill_states by default */
-	$config['system']['kill_states'] = true;
+	// no longer used (used to set kill_states)
+	return;
 }
 
 function upgrade_098_to_099() {
@@ -4326,4 +4325,16 @@ function upgrade_137_to_138() {
 	}
 }
 
+function upgrade_138_to_139() {
+	global $config;
+
+	// clean up state killing on gateway failure. having kill_states set used to mean it was disabled
+	// now set gw_down_kill_states if enabled. 
+	if (!isset($config['system']['kill_states'])) {
+		$config['system']['gw_down_kill_states'] = true;
+	} else {
+		unset($config['system']['kill_states']);
+	}
+}
+
 ?>