diff options
| author | jim-p <jimp@pfsense.org> | 2010-06-11 13:42:19 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-06-11 13:45:19 -0400 |
| commit | 51e72bf52e28e49d3f29acd17c25081b76087121 (patch) | |
| tree | 317319c7eb982d895e0ce50b8c02583a453c186b /etc/rc.filter_synchronize | |
| parent | 7c7c8be2646ab8d0018dd0b983162cc2750194a4 (diff) | |
| download | pfsense-51e72bf52e28e49d3f29acd17c25081b76087121.zip pfsense-51e72bf52e28e49d3f29acd17c25081b76087121.tar.gz | |
Rework connections a bit and report errors when they happen.
Diffstat (limited to 'etc/rc.filter_synchronize')
| -rwxr-xr-x | etc/rc.filter_synchronize | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize index b76f08c..910f55d 100755 --- a/etc/rc.filter_synchronize +++ b/etc/rc.filter_synchronize @@ -267,19 +267,49 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) { update_filter_reload_status("Signaling CARP reload signal..."); carp_sync_xml($synchronizetoip, $carp['password'], $sections, $port); $cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port); - $msg = new XML_RPC_Message('pfsense.filter_configure', array(new XML_RPC_Value($carp['password'], 'string'))); + $params = array( + XML_RPC_encode($carp['password']) + ); + + $msg = new XML_RPC_Message('pfsense.filter_configure', $params); $username = $config['system']['user'][0]['name']; $cli->setCredentials($username, $carp['password']); - $cli->send($msg, "900"); + $resp = $cli->send($msg, "900"); + + if(!$resp) { + $error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}."; + log_error($error); + file_notice("sync_settings", $error, "Settings Sync", ""); + } elseif($resp->faultCode()) { + $error = "An error code was received while attempting Filter sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error($error); + file_notice("sync_settings", $error, "Settings Sync", ""); + } else { + log_error("Filter sync successfully completed with {$synchronizetoip}:{$port}."); + $numberofruns = 3; + } + /* signal a carp reload */ $cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port); - $msg = new XML_RPC_Message('pfsense.interfaces_carp_configure', array(new XML_RPC_Value($carp['password'], 'string'))); - $cli->setCredentials($username, $carp['password']); - $cli->send($msg, "900"); + $msg = new XML_RPC_Message('pfsense.interfaces_carp_configure', $params); + $resp = $cli->send($msg, "900"); + + if(!$resp) { + $error = "A communications error occured while attempting CARP sync with username {$username} {$synchronizetoip}:{$port}."; + log_error($error); + file_notice("sync_settings", $error, "Settings Sync", ""); + } elseif($resp->faultCode()) { + $error = "An error code was received while attempting CARP sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString(); + log_error($error); + file_notice("sync_settings", $error, "Settings Sync", ""); + } else { + log_error("CARP sync successfully completed with {$synchronizetoip}:{$port}."); + $numberofruns = 3; + } } break; } } } -?>
\ No newline at end of file +?> |
