Merge remote branch 'mainline/master' into inc

1 files changed, 14 insertions, 8 deletions

diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index a1a8762..a46fae3 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -140,13 +140,19 @@ function unlock($cfglckkey = 0) {
 function send_event($cmd) {
 	global $g;
 
-	$fd = fsockopen($g['event_address']);
-	if ($fd) {
-		fwrite($fd, $cmd);
-		$resp = fread($fd, 4096);
-		if ($resp != "OK\n")
-			log_error("send_event: sent {$cmd} got {$resp}");
-		fclose($fd);
+	$try = 0;
+	while ($try < 3) {
+		$fd = @fsockopen($g['event_address']);
+		if ($fd) {
+			fwrite($fd, $cmd);
+			$resp = fread($fd, 4096);
+			if ($resp != "OK\n")
+				log_error("send_event: sent {$cmd} got {$resp}");
+			fclose($fd);
+			$try = 3;
+		} else
+			mwexec_bg("/usr/bin/nice -n20 /usr/local/sbin/check_reload_status");
+		$try++;
 	}
 }
 
@@ -1043,7 +1049,7 @@ function safe_mkdir($path, $mode=0755) {
         global $g;
 
         if (!is_file($path) && !is_dir($path)) {
-                return @mkdir($path, $mode);
+                return @mkdir($path, $mode, true);
         } else {
                 return false;
         }