Changeset 0237078

Timestamp:

Jun 24, 2010, 1:48:09 AM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

master, debian, mac, no-cups, nodebathena, web

Children:

aef31c3

Parents:

1e04f22

git-author:

root <root@…> (05/31/10 22:25:06)

git-committer:

Jessica B. Hamrick <jhamrick@…> (06/24/10 01:48:09)

Message:

Handle SIGHUP in the backend

Files:

• .gitignore (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/lib/gutenbach (modified) (5 diffs)

.gitignore

@@ -9 +9 @@
 debian/gutenbach.substvars
 debian/gutenbach
+debian/gutenbach.debhelper.log

debian/changelog

@@ +1 @@
+gutenbach (2.01) unstable; urgency=low
+
+  * Handle SIGTERM in the gutenbach backend, so jobs don't
+  keep playing even after being dequeued.
+
+ -- Jessica Hamrick <jhamrick@mit.edu>  Mon, 31 May 2010 22:23:53 -0400
+
 gutenbach (2.0) unstable; urgency=low
 

debian/lib/gutenbach

@@ -31 +31 @@
 
 my $ua = new LWP::UserAgent;
+
+# This variable contains the pid of the child process (which runs
+# mplayer) once it has been forked, so that we can kill it on SIGTERM
+my $pid;
 
 # Replace STDERR with a log file in /tmp.
@@ -107 +111 @@
 # SIGHUP handler, in case we were aborted
 sub clear_status {
+  kill 15, $pid if $pid;
   my @zwrite_command = (qw(/usr/bin/zwrite -d -n -c), $zephyr_class, "-i", $queue.'@'.$host, "-s", "Gutenbach Music Spooler");
   open(ZEPH, "|-", @zwrite_command);
@@ -113 +118 @@
   die;
 }
+
 $SIG{HUP} = \&clear_status;
+$SIG{TERM} = \&clear_status;
 
 # Read the metadata information from the file.
@@ -282 +289 @@
   my ($filepath, $opts) = @_;
 
-
   # Open up a zwrite command to show the mplayer output
   my @zwrite_command = (qw(/usr/bin/zwrite -d -n -c), $zephyr_class, "-i", $queue.'@'.$host, "-s", "Gutenbach Music Spooler");
 
-  print STDERR "Invoking @zwrite_command\n";
-  open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
+  print STDERR "Invoking (from play_mplayer_audio): @zwrite_command\n";
 
   # fork for mplayer
-  my $pid = open(MP3STATUS, "-|");
+  $pid = open(MP3STATUS, "-|");
   unless (defined $pid) {
+    open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
     print ZEPHYR "Couldn't fork: $!\n";
     close(ZEPHYR);
@@ -299 +305 @@
   if ($pid) { #parent
     # Check if there were any errors
-    
     if ($_ = <MP3STATUS>) {
+      open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
       print ZEPHYR "Playback completed with the following errors:\n";
       while (<MP3STATUS>) {
         print ZEPHYR $_;
       }
+      close(ZEPHYR);
     } else {
+      open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
       print ZEPHYR "Playback completed successfully.\n";
+      close(ZEPHYR);
     }
     close(MP3STATUS) || print ZEPHYR "mplayer exited $?\n";
-
-    close(ZEPHYR);
   }
   else { # child