diff options
| author | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-23 16:26:08 -0400 |
|---|---|---|
| committer | Scott Ullrich <sullrich@sullrich-MacBookPro.geekgod.com> | 2009-05-23 16:26:08 -0400 |
| commit | c77050d5ad6ec5349895b6b9164a011418fb1a7f (patch) | |
| tree | 6d3fe592fe05c13e98f851287e98de219917b8d8 /etc | |
| parent | 655e9c79fab1543b4adb4d820dae75e9b8565bf9 (diff) | |
| download | pfsense-c77050d5ad6ec5349895b6b9164a011418fb1a7f.zip pfsense-c77050d5ad6ec5349895b6b9164a011418fb1a7f.tar.gz | |
Surpress semaphore errors
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/util.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index b7e7eae..ce9bb10 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -354,13 +354,15 @@ function lock($lock) { $config_lock_key = ftok("{$g['tmp_path']}/{$lock}.lock", 'a'); $cfglckkey = sem_get($config_lock_key, 1); $cfglckkeyconsumers++; + // Rely on or own logging for errors here. + ini_set('error_reporting', E_NONE); if (!sem_acquire($cfglckkey)) { log_error("WARNING: lock() - Could not acquire {$lock} lock!"); sem_remove($cfglckkey); return NULL; } else if ($g['debug']) log_error("lock() - Got {$file} lock."); - + ini_set('error_reporting', E_ALL & ~E_NOTICE); return $cfglckkey; } @@ -623,4 +625,4 @@ function resolve_retry($hostname, $retries = 5) { } -?> +?>
\ No newline at end of file |
