Merge pull request #7 from cavalier38/master

Prevent stall lin processes
lunar-linux · Jul 9, 2012 · e254736 · e254736
2 parents eb2a7da + ef928a8
commit e254736
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/libs/logging.lunar b/libs/logging.lunar
@@ -25,6 +25,8 @@ start_logging () {
 
 stop_logging() {
   debug_msg "stop_logging ($@)"
+  # Make sure the FIFO gets closed
+  echo > $C_FIFO
   echo "++ Mark Compile stop   : \"$MODULE\" \"$VERSION\" \"$(date -Ru)\"" >> $C_LOG
   message  "${MESSAGE_COLOR}Creating"                        \
            "${FILE_COLOR}$COMPILE_LOGS/$MODULE-$VERSION.bz2"  \
@@ -88,12 +90,12 @@ activate_voyeur()  {
   debug_msg "activate_voyeur ($@)"
   if [ -z "$SILENT" ] ; then
     case $VOYEUR in
-      on) tee -a $C_LOG < $C_FIFO              & ;;
-      p*) tee -a $C_LOG < $C_FIFO | progress   & ;;
-       *) tee -a $C_LOG < $C_FIFO >/dev/null   & ;;
+      on) ( tee -a $C_LOG < $C_FIFO            ; rm -f "$C_FIFO" ) & ;;
+      p*) ( tee -a $C_LOG < $C_FIFO | progress ; rm -f "$C_FIFO" ) & ;;
+       *) ( tee -a $C_LOG < $C_FIFO >/dev/null ; rm -f "$C_FIFO" ) & ;;
     esac
   else
-    tee -a $C_LOG < $C_FIFO >/dev/null &
+    ( tee -a $C_LOG < $C_FIFO >/dev/null ; rm -f "$C_FIFO" ) &
   fi
 }