notify: Don't send blocked notifications as "requeued"

Blocked jobs really aren't being requeued, they are just "in the queue",
like any other job limited by no devices, or modem groups, or delayed,
etc.

diff --git a/doc/RELEASENOTES-6.0.txt b/doc/RELEASENOTES-6.0.txt
index 379ea94dda30b0bcaa983e4beb9e6fd09fa64425..7a317d6d4394b99dd5af98aa2b74f9e1f1ac8b68 100644 (file)
--- a/doc/RELEASENOTES-6.0.txt
+++ b/doc/RELEASENOTES-6.0.txt
@@ -22,10 +22,15 @@ Overview
 
 Upgrade to CVS from previous 4.4 releases
 -----------------------------------------------------------------------------
-  There are no particular differences to note yet during the upgrade
-  process, but if you have clients that still use the old protocol (not
-  the common FTP style protocol), they will no longer work with a new
-  hfaxd daemon.
+  There are only 2 differences to note yet during the upgrade
+  process, probably neither of which affect most people.
+
+  If you have clients that still use the old protocol (not the common
+  FTP style protocol), they will no longer work with a new hfaxd daemon.
+
+  The notification email machanism no longer sends "blocked" emails by
+  default, as the jobs re not being requeued, or done.  To continue
+  receiving them, you'll need to configure it in FaxNotify.
 
 Changes for HylaFAX 6.0
 -----------------------------------------------------------------------------
@@ -318,3 +323,4 @@ Changes for HylaFAX 6.0
   never separate UTF-8 characters in multiple encoded words (2009-03-20)
 * Adds Q encoding possibility (2009-03-20)
 * Select between Q and B encoding according to data to encode (2009-03-20)
+* notify: Don't send blocked notifications as "requeued" (2009-03-27)

diff --git a/man/notify.1m b/man/notify.1m
index abcf21aa86ba0e9313935f3ea600df03bf766beb..72bdcecccab3770931122312b0c06b82352df24d 100644 (file)
--- a/man/notify.1m
+++ b/man/notify.1m
@@ -56,24 +56,29 @@ a string that specifies why the user is being notified; one of:
 .nf
 .ta  +\w'poll_no_document    'u +\w'Notes    'u
 \fBWhy\fP      \fBNotes\fP     \fBMeaning\fP
-\fIdone\fP             job was completed successfully
-\fIfailed\fP    \(S1   job was not completed
-\fIrejected\fP         job was rejected for specified reasons
-\fIblocked\fP          job is blocked by concurrent jobs
-\fIrequeued\fP \(S1    job was not completed, but was requeued for retry
-\fIremoved\fP          job was deleted from the queue
-\fIkilled\fP           job was deleted from the queue
-\fItimedout\fP         job could not be sent before kill time expired
-\fIformat_failed\fP            document conversion failed
-\fIno_formatter\fP             the document conversion program was not found
-\fIpoll_rejected\fP    \(S1    a polling request was rejected by the remote side
-\fIpoll_no_document\fP \(S1    a polling request failed because nothing was available
-\fIpoll_failed\fP      \(S1    a polling request failed for an unknown reason
+\fIdone\fP     \(S1    job was completed successfully
+\fIfailed\fP   \(S1\(S2        job was not completed
+\fIrejected\fP \(S1    job was rejected for specified reasons
+\fIrequeued\fP \(S2    job was not completed, but was requeued for retry
+\fIremoved\fP  \(S1    job was deleted from the queue
+\fIkilled\fP   \(S1    job was deleted from the queue
+\fItimedout\fP \(S1    job could not be sent before kill time expired
+\fIformat_failed\fP    \(S1    document conversion failed
+\fIno_formatter\fP     \(S1    the document conversion program was not found
+\fIpoll_rejected\fP    \(S1\(S2        a polling request was rejected by the remote side
+\fIpoll_no_document\fP \(S1\(S2        a polling request failed because nothing was available
+\fIpoll_failed\fP      \(S1\(S2        a polling request failed for an unknown reason
+\fIblocked\fP  \(S3    job is blocked by concurrent jobs
 .sp .5
 .fi
 .br
-\(S1 A transcript of the failed communication is returned
+\(S1 A final job state
+.br
+\(S2 A transcript of the failed communication is returned
 to the sender.
+.br
+\(S3 No emails are sent for the block state, the job has been neither requeued nor done, but remains waiting
+in the queue for the ability to be sent.
 .TP
 .B jobtime
 the total transmission time of a successful job or the connect
@@ -132,6 +137,22 @@ any problems before those problems are reported by the users.
 Possible settings are ``yes'', ``always'', ``no'', ``never'', and ``errors''.
 If ``errors'' is used then the notification message is only sent to FaxMaster
 when the job experienced an error.  The default is ``no''.
+.P
+The settings of the user in
+.B $notify
+(read from the
+.B sendq
+job file) controls whether the user will get the notification email.  If you want to force
+notification emails, irregardless of the users selection, or force a blocked notification (which is
+not sent by default), you can set
+.sp
+.nf
+.ft C
+notify="always"
+.ft R
+.fi
+.sp
+which will force the notify script to send the email.
 .SH FILES
 .nf
 .ta \w'${SENDMAIL}    'u

diff --git a/util/notify.sh.in b/util/notify.sh.in
index c36b654ac36b6b20aa9df5b85eb938fe74f8fb5c..ac62964a98f96e5f750b7f3f534826add3558597 100644 (file)
--- a/util/notify.sh.in
+++ b/util/notify.sh.in
@@ -197,15 +197,14 @@ SENDTO="$mailaddr"
 export SENDTO
 
 case "$WHY:$notify" in
+    *":always")                     do_notify;;     # They've asked for it
+
     "requeued:when done+requeued")  do_notify;;     # Requeued
     "requeued:when requeued")       do_notify;;     # Requeued
     "requeued:when done")           ;;              # Do nothing;
     "requeued:none")                ;;              # Do nothing;
 
-    "blocked:when done+requeued")   do_notify;;     # Requeued
-    "blocked:when requeued")        do_notify;;     # Requeued
-    "blocked:when done")            ;;              # Do nothing;
-    "blocked:none")                 ;;              # Do nothing;
+    "blocked:"*)                    ;;              # Blocked
 
     "done:when done+requeued")      do_notify;;     # Done
     "done:when requeued")           ;;              # Do nothing