Commit d48173fb authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Minor edits that I never committed.

parent 058fa63f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group. # Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -249,7 +249,7 @@ if (! $frontend) { ...@@ -249,7 +249,7 @@ if (! $frontend) {
# #
if (ExpNodes($pid, $eid) > 2) { if (ExpNodes($pid, $eid) > 2) {
my $vlans_result = my $vlans_result =
DBQueryFatal("select * from vlans where ". DBQueryFatal("select pid from virt_lans where ".
"pid='$pid' and eid='$eid'"); "pid='$pid' and eid='$eid'");
if (!$vlans_result->numrows) { if (!$vlans_result->numrows) {
...@@ -271,9 +271,11 @@ if (system("$tbdir/tbreport -b $pid $eid 2>&1 > $repfile") != 0) { ...@@ -271,9 +271,11 @@ if (system("$tbdir/tbreport -b $pid $eid 2>&1 > $repfile") != 0) {
# #
# Increment the project experiment count/lastdate. This is informational. # Increment the project experiment count/lastdate. This is informational.
# #
DBQueryWarn("update projects ". if (! $frontend) {
"set expt_count=expt_count+1, expt_last=now() ". DBQueryWarn("update projects ".
"where pid='$pid'"); "set expt_count=expt_count+1, expt_last=now() ".
"where pid='$pid'");
}
# #
# Gen up a date for the started field of the record, and insert it. # Gen up a date for the started field of the record, and insert it.
...@@ -321,13 +323,26 @@ TBExptCloseLogFile($pid, $eid); ...@@ -321,13 +323,26 @@ TBExptCloseLogFile($pid, $eid);
# #
# Dump the report file and the log file to the user via email. # Dump the report file and the log file to the user via email.
# #
my $message = my $message;
"Your experiment `$eid' in project `$pid' is now configured.\n" .
"Here is the experiment summary detailing the nodes that were\n" . if ($frontend) {
"allocated to you. You may use the `Qualified Name' to log on\n" . $message =
"to your nodes. See /etc/hosts on your nodes (when running\n" . "Your experiment `$eid' in project `$pid' is now preloaded.\n" .
"FreeBSD, Linux, or NetBSD) for the IP mapping on each node\n" . "You can check the web interface to see if it looks the way\n" .
"\n" . "you expected it to. If so, you may swap the experiment in,\n" .
"or terminate it, at any time.\n" .
"\n";
}
else {
$message =
"Your experiment `$eid' in project `$pid' is now configured.\n" .
"Here is the experiment summary detailing the nodes that were\n" .
"allocated to you. You may use the `Qualified Name' to log on\n" .
"to your nodes. See /etc/hosts on your nodes (when running\n" .
"FreeBSD, Linux, or NetBSD) for the IP mapping on each node.\n" .
"\n";
}
$message .=
"User: $user_name\n" . "User: $user_name\n" .
"EID: $eid\n" . "EID: $eid\n" .
"PID: $pid\n" . "PID: $pid\n" .
...@@ -344,7 +359,8 @@ my $message = ...@@ -344,7 +359,8 @@ my $message =
SENDMAIL("$user_name <$user_email>", SENDMAIL("$user_name <$user_email>",
"New Experiment Created: $pid/$eid", "New Experiment " . (($frontend == 0) ? "Created" : "Preloaded") .
": $pid/$eid",
$message, $message,
"$user_name <$user_email>", "$user_name <$user_email>",
"Bcc: $TBLOGS", "Bcc: $TBLOGS",
......
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