- fix error handling in update-ssh-keys

- make runone exit with the exit code of the executed program
- log stdout/stderr of all programs to /var/log/php-cron-box.log
- log failed executions with error code to /var/log/php-cron-box.fail
- don't swallow errors from named

Author: schumann

cron-box

@@ -2,6 +2,25 @@
 # $Id$
 # Run the cron for a box
 
+FAIL_LOGFILE=/var/log/php-cron-box.fail
+
+LOGFILE=/var/log/php-cron-box.log
+
+exec >> $LOGFILE
+exec 2>&1
+exec </dev/null
+
+now() {
+	date +%Y.%m.%d-%H.%M.%S
+}
+
+log_fail() {
+	SVC=$1
+	ERR=$2
+
+	echo "`now` $SVC $ERR" >> $FAIL_LOGFILE
+}
+
 # pull in details for this box
 . /local/systems/boxen/`hostname`
 
@@ -58,7 +77,14 @@ for svc in $WHAT ; do
 	fi;
 
 	if test -x /local/systems/$svc ; then
+        echo
+        echo "`now` running $svc"
 		runone /tmp/.$svc.runone.pid /local/systems/$svc
+		ERR=$?
+
+		if test "$ERR" != "0"; then
+			log_fail $SVC $ERR
+		fi
 	else
 		echo "Something is wrong. /local/systems/$svc on `hostname` is not executable." \
 		| mail -s "Broken cronjob on `hostname`" [email protected] -- [email protected]

process-zone-file

@@ -6,6 +6,6 @@ if php /local/systems/maintain-master-dns.php > $file ; then
 	if /usr/sbin/named-checkzone php.net $file ; then
 		cp -f $file /local/mirrors/php-master-web/fetch/php.net.zone
 		mv -f $file /var/named/php.net
-		/etc/init.d/named restart 2>&1 >/dev/null;
+		/etc/init.d/named restart
 	fi
 fi

runone

@@ -14,7 +14,7 @@ if (-e $lockfile) {
     # only warn when the lock is more than an hour old
     print "already running, pid $pid\n"
       if (stat _)[9] < time() - 3600;
-    exit;
+    exit(99);
   }
   close FILE;
 }
@@ -25,4 +25,7 @@ print FILE $$;
 close FILE;
 
 system @ARGV;
+my $err = $? >> 8; # perl wtf
 unlink $lockfile;
+
+exit($err);

update-ssh-keys

@@ -1,23 +1,42 @@
 #!/usr/bin/env php
 <?php
+
+function die1($msg)
+{
+    fwrite(STDERR, $msg . "\n");
+    exit(1);
+}
+
+function run_system($cmd, $errmsg = "")
+{
+    system($cmd, $exit);
+
+    if ($exit !== 0) {
+        die1("failed: "
+            . $errmsg
+            . ' ('
+            . $cmd
+            . ')');
+    }
+}
+
 /* Fetch SSH Keys from the master db and create [email protected]
  * files and push them to the gitolite administration repository
  */
 define('SSH_KEY_REPO', '/local/gitolite-admin/keydir');
 
 mysql_connect('localhost', 'nobody')
-    or die ('unable to connect to server');
+    or die1 ('unable to connect to server');
 mysql_select_db('phpmasterdb')
-    or die ('unable to select database');
+    or die1 ('unable to select database');
 
 $query = 'SELECT DISTINCT username, ssh_keys FROM users';
-$res   = mysql_query($query) or die ('cannot query ssh keys');
+$res   = mysql_query($query) or die1 ('cannot query ssh keys');
 
 chdir(SSH_KEY_REPO)
-    or die ('cannot change working directory');
+    or die1 ('cannot change working directory');
 
-false !== system('git pull origin master')
-    or die ('cannot update repository');
+run_system('git pull origin master', 'pull failed');
 
 #TODO: remove all keys first in order to remove unused keys!
 
@@ -32,8 +51,7 @@ while($row = mysql_fetch_array($res, MYSQL_ASSOC)) {
         }
     }
 
-    false !== system('git add -u :/')
-        or die ('cannot update git information');
+    run_system('git add -u :/', 'cannot update git information');
 
     foreach($ssh_keys as $keyinfo) {
         $filename = sprintf('%s@%s.pub',
@@ -43,16 +61,13 @@ while($row = mysql_fetch_array($res, MYSQL_ASSOC)) {
         $fp = fopen($filename, 'w+');
         fwrite($fp, trim($keyinfo['key']) . "\n");
         fclose($fp);
-        false !== system('git add ' . $filename)
-            or die ('cannot execute git');
+        run_system('git add ' . $filename, 'cannot execute git');
     }
 }
 
 if (system('git status --porcelain -uno')) {
-    false !== system('git commit -m"Automatic update"')
-        or die ('cannot commit');
-    false !== system('git push origin master')
-        or die ('cannot push');
+    run_system('git commit -m"Automatic update"', 'cannot commit');
+    run_system('git push origin master', 'cannot push');
 }
 
 function get_ssh_keys($string) {