Revision 2de2abe0
Added by Ermal LUÇI almost 15 years ago
| etc/rc.filter_synchronize | ||
|---|---|---|
| 306 | 306 |
log_error("Filter sync successfully completed with {$synchronizetoip}:{$port}.");
|
| 307 | 307 |
$numberofruns = 3; |
| 308 | 308 |
} |
| 309 |
|
|
| 310 |
/* signal a carp reload */ |
|
| 311 |
$cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port);
|
|
| 312 |
$msg = new XML_RPC_Message('pfsense.interfaces_carp_configure', $params);
|
|
| 313 |
$resp = $cli->send($msg, "900"); |
|
| 314 |
|
|
| 315 |
if(!$resp) {
|
|
| 316 |
$error = "A communications error occured while attempting CARP sync with username {$username} {$synchronizetoip}:{$port}.";
|
|
| 317 |
log_error($error); |
|
| 318 |
file_notice("sync_settings", $error, "Settings Sync", "");
|
|
| 319 |
} elseif($resp->faultCode()) {
|
|
| 320 |
$error = "An error code was received while attempting CARP sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
|
|
| 321 |
log_error($error); |
|
| 322 |
file_notice("sync_settings", $error, "Settings Sync", "");
|
|
| 323 |
} else {
|
|
| 324 |
log_error("CARP sync successfully completed with {$synchronizetoip}:{$port}.");
|
|
| 325 |
$numberofruns = 3; |
|
| 326 |
} |
|
| 327 | 309 |
} |
| 328 |
break;
|
|
| 310 |
break; |
|
| 329 | 311 |
} |
| 330 | 312 |
} |
| 331 | 313 |
} |
| usr/local/www/xmlrpc.php | ||
|---|---|---|
| 166 | 166 |
$config = array_merge($config, $params[0]); |
| 167 | 167 |
$mergedkeys = implode(",", array_keys($params[0]));
|
| 168 | 168 |
write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."),$mergedkeys));
|
| 169 |
interfaces_vips_configure(); |
|
| 169 | 170 |
return $xmlrpc_g['return']['true']; |
| 170 | 171 |
} |
| 171 | 172 |
|
| ... | ... | |
| 219 | 220 |
$config = array_merge_recursive_unique($config, $params[0]); |
| 220 | 221 |
$mergedkeys = implode(",", array_keys($params[0]));
|
| 221 | 222 |
write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client.");
|
| 223 |
interfaces_vips_configure(); |
|
| 222 | 224 |
return $xmlrpc_g['return']['true']; |
| 223 | 225 |
} |
| 224 | 226 |
|
Also available in: Unified diff
No need to triger a vips re-configure explicitly but rather detect this during config merges. This is the best way to do this after fixing Ticket #601.