Changeset 89

Timestamp:

04/19/2006 00:46:46 (6 years ago)

Author:

ccowart

Message:

Sweet, sweet logging.

Location:

confman

Files:

• Makefile (modified) (2 diffs)
• confman (modified) (6 diffs)

confman/Makefile

@@ -1 +1 @@
 PREFIX := /usr/local/rescomp
+
 install : 
         mkdir -p /usr/local/rescomp/etc/env.d
@@ -18 +19 @@
 fetch:
         svn update
+

confman/confman

@@ -19 +19 @@
 MYNAME=`basename $0`
 
+# First things first. Check to see if the logging fd is open. If it's not,
+# we re-spawn confman inside a pipe.
+if (true >&5) 2>/dev/null ; then
+        exec 2>&5
+else
+        exec 3>&1
+        exec $0 $* 5>&1 1>&3 | logger -t "$MYNAME ($USER)" -s
+        exit ${PIPESTATUS[0]}
+fi
+
 # Get the global config
 if [ -f $GCONF ] ; then 
@@ -132 +142 @@
                 update || cleanexit
 
+                echo "Commit operation started" >&2
                 for layer in $LAYERS ; do
                         conf_commit $layer $msg || return $?
@@ -137 +148 @@
                 for layer in $LAYERS ; do
                         echo "Rolling on $layer..."
-                        conf_rollout $layer
+                        conf_rollout $layer || return $?
                 done
                 for file in $SINGULARITIES ; do
-                        conf_assemble_sing $file
-                done
+                        conf_assemble_sing $file || return $?
+                done
+                echo "Commit operation finished successfully" >&2
                 rm -f $msg
 
@@ -162 +174 @@
                 update || cleanexit
 
+                echo "Installation operation started." >&2
                 for layer in $LAYERS ; do
                         conf_commit $layer $msg || return $?
@@ -170 +183 @@
 
                         for layer in $LAYERS ; do
-                                conf_install $layer $file
+                                conf_install $layer $file || return $?
                         done
                         
                         if [[ "$SINGULARITIES" =~ "$file" ]] ; then
-                                conf_assemble_file $file
+                                conf_assemble_file $file || return $?
                         fi
                 done
+                echo "Installation operation succeeded." >&2
         fi
 }
@@ -531 +545 @@
                 print_usage 1
         else
-                conf_rollback $module $checkpoint $clock
+                echo "Rolling $module back to $checkpoint $clock" >&2
+                conf_rollback $module $checkpoint $clock || cleanexit
                 for layer in $LAYERS ; do
                         echo "Rolling on $layer..."
-                        conf_rollout $layer
+                        conf_rollout $layer || cleanexit
                 done
 
                 for file in $SINGULARITIES ; do
-                        conf_assemble_sing $file
-                done
+                        conf_assemble_sing $file || cleanexit
+                done
+                echo "Rollback succeeded." >&2
         fi
 }