Commit 16fe8eb0 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Change the interval to 5 minutes instead of 1 minute.

Run terminate in the foreground.
parent 47d32e2b
......@@ -56,7 +56,8 @@ my $LOGFILE = "$TB/log/apt_daemon.log";
my $MANAGEINSTANCE = "$TB/bin/manage_instance";
my $PROTOUSER = "elabman";
my $SUDO = "/usr/local/bin/sudo";
my $SLEEP_INTERVAL = 60;
my $WGET = "/usr/local/bin/wget";
my $SLEEP_INTERVAL = 300;
my $UPDATE_INTERVAL = (60 * 60 * 24);
#
......@@ -199,8 +200,9 @@ sub KillFailedInstances()
print STDERR "Would try to terminate $instance\n";
next;
}
# Use debug option to keep it from going into the background.
my $output = emutil::ExecQuiet("$SUDO -u $PROTOUSER ".
"$MANAGEINSTANCE terminate $uuid");
"$MANAGEINSTANCE -d terminate $uuid");
my $status = $?;
print STDERR "$output\n"
if ($output ne "");
......@@ -247,8 +249,9 @@ sub ExpireInstances()
print STDERR "Would try to terminate $instance\n";
next;
}
# Use debug option to keep it from going into the background.
my $output = emutil::ExecQuiet("$SUDO -u $PROTOUSER ".
"$MANAGEINSTANCE terminate $uuid");
"$MANAGEINSTANCE -d terminate $uuid");
my $status = $?;
print STDERR "$output\n"
if ($output ne "");
......@@ -304,6 +307,8 @@ sub ReportLockdownExpired()
}
exit(0);
my $reportcounter = 0;
# Do this once at startup
......
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