Commit a21dbef6 authored by Leigh Stoller's avatar Leigh Stoller

Minor changes to email formatting, show dates in UTC time.

parent 67a0e58e
...@@ -110,7 +110,11 @@ while( my ($idx, $pid, $count, $type, $end, $email) = ...@@ -110,7 +110,11 @@ while( my ($idx, $pid, $count, $type, $end, $email) =
"If you do not intend to use these resources, please\n" . "If you do not intend to use these resources, please\n" .
"cancel this reservation as soon as possible, since\n" . "cancel this reservation as soon as possible, since\n" .
"the nodes are now unavailable to other users for\n" . "the nodes are now unavailable to other users for\n" .
"the duration of your reservation.\n" . "the duration of your reservation.\n".
"\n".
"Failure to use your reservation within six hours will result\n".
"in cancellation of the reservation so that the nodes are\n".
"available to other users.\n".
"\n" . "\n" .
"Please note that we make no guarantees about the\n" . "Please note that we make no guarantees about the\n" .
"availability or suitability of these nodes for your\n" . "availability or suitability of these nodes for your\n" .
...@@ -140,6 +144,9 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email) = ...@@ -140,6 +144,9 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email) =
print STDERR "Reservation $idx for project $pid, $count x $type from " . print STDERR "Reservation $idx for project $pid, $count x $type from " .
"$start-$end <$email>\n" if( $debug ); "$start-$end <$email>\n" if( $debug );
$start = TBDateStringUTC($start);
$end = TBDateStringUTC($end);
next if( $impotent ); next if( $impotent );
SENDMAIL( $email, "Upcoming $SITE reservation", SENDMAIL( $email, "Upcoming $SITE reservation",
"You have a reservation scheduled at $SITE, with project\n" . "You have a reservation scheduled at $SITE, with project\n" .
...@@ -152,6 +159,10 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email) = ...@@ -152,6 +159,10 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email) =
"the nodes will be unavailable to other users for\n" . "the nodes will be unavailable to other users for\n" .
"the duration of your reservation.\n" . "the duration of your reservation.\n" .
"\n" . "\n" .
"Failure to use your reservation within six hours will result\n".
"in cancellation of the reservation so that the nodes are\n".
"available to other users.\n".
"\n" .
"Please note that we make no guarantees about the\n" . "Please note that we make no guarantees about the\n" .
"availability or suitability of these nodes for your\n" . "availability or suitability of these nodes for your\n" .
"experiment(s).\n" . "experiment(s).\n" .
...@@ -190,6 +201,9 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email, $cancel) = ...@@ -190,6 +201,9 @@ while( my ($idx, $pid, $count, $type, $start, $end, $email, $cancel) =
$res->Cancel(); $res->Cancel();
$start = TBDateStringUTC($start);
$end = TBDateStringUTC($end);
SENDMAIL( $email, "$SITE reservation", SENDMAIL( $email, "$SITE reservation",
"Your reservation for $count $type nodes in project $pid,\n" . "Your reservation for $count $type nodes in project $pid,\n" .
"starting at $start and ending at $end,\n". "starting at $start and ending at $end,\n".
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment