Project

General

Profile

« Previous | Next » 

Revision d30afa60

Added by Jim Pingle about 14 years ago

In upgrade code for server load balancing, set redirect_mode. Also in the backend code, assume redirect_mode as the default if it's not set.

View differences:

etc/inc/upgrade_config.inc
897 897
		}
898 898
		/* Convert sitedown entries to pools and re-attach */
899 899
		for ($i = 0; isset($vs_a[$i]); $i++) {
900
			/* Set mode while we're here. */
901
			$vs_a[$i]['mode'] = "redirect_mode";
900 902
			if (isset($vs_a[$i]['sitedown'])) {
901 903
				$pool = array();
902 904
				$pool['type'] = 'server';
etc/inc/vslb.inc
237 237
	if(is_array($vs_a)) {
238 238
		for ($i = 0; isset($vs_a[$i]); $i++) {
239 239
			switch($vs_a[$i]['mode']) {
240
				case 'redirect_mode': {
240
				case 'relay':
241
					$conf .= "relay \"{$vs_a[$i]['name']}\" {\n";
242
					$conf .= "  listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n";
243
					$conf .= "  protocol \"{$vs_a[$i]['relay_protocol']}\"\n";
244
					$conf .= "  forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
245

  
246
					if (isset($vs_a[$i]['sitedown']) &&  strlen($vs_a[$i]['sitedown']) > 0)
247
						$conf .= "  forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
248
					$conf .= "}\n";
249
					break;
250
				/* Default to Redirect Mode */
251
				case 'redirect_mode':
252
				default:
241 253
					$conf .= "redirect \"{$vs_a[$i]['name']}\" {\n";
242 254
					$conf .= "  listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n";
243 255
					$conf .= "  forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
......
251 263

  
252 264
					$conf .= "}\n";
253 265
					break;
254
				}
255
				case 'relay': {
256
					$conf .= "relay \"{$vs_a[$i]['name']}\" {\n";
257
					$conf .= "  listen on {$vs_a[$i]['ipaddr']} port {$vs_a[$i]['port']}\n";
258
					$conf .= "  protocol \"{$vs_a[$i]['relay_protocol']}\"\n";
259
					$conf .= "  forward to <{$vs_a[$i]['pool']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
260

  
261
					if (isset($vs_a[$i]['sitedown']) &&  strlen($vs_a[$i]['sitedown']) > 0)
262
						$conf .= "  forward to <{$vs_a[$i]['sitedown']}> port {$pools[$vs_a[$i]['pool']]['port']} {$check_a[$pools[$vs_a[$i]['pool']]['monitor']]} \n";
263
					$conf .= "}\n";
264
					break;
265
				}
266 266
			}
267 267
		}
268 268
	}

Also available in: Unified diff