Commit 2ae5f2cd authored by Leigh B Stoller's avatar Leigh B Stoller

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents 4e935e6d 459745b6
...@@ -98,6 +98,18 @@ if (NoLogins()) { ...@@ -98,6 +98,18 @@ if (NoLogins()) {
XMLError(503, "CM temporarily offline; please try again later"); XMLError(503, "CM temporarily offline; please try again later");
} }
#
# Check for excessive load
#
if ($MAINSITE) {
my $uptime = `uptime`;
if ($uptime =~ /load averages:\s+([\.\d]+),\s+([\.\d]+),\s+[\.\d]+/) {
if ($1 > 10.0) {
XMLError(511, "Server is WAY too busy; please try again later");
}
}
}
# #
# Make sure the client presented a valid certificate that apache says # Make sure the client presented a valid certificate that apache says
# is okay. # is okay.
......
# -*- tcl -*- # -*- tcl -*-
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2004, 2005 University of Utah and the Flux Group. # Copyright (c) 2004-2010 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
...@@ -76,6 +76,7 @@ EventTimeline instproc updatedb {DB} { ...@@ -76,6 +76,7 @@ EventTimeline instproc updatedb {DB} {
var_import ::GLOBALS::eid var_import ::GLOBALS::eid
var_import ::TBCOMPAT::objtypes var_import ::TBCOMPAT::objtypes
var_import ::TBCOMPAT::eventtypes var_import ::TBCOMPAT::eventtypes
var_import ::TBCOMPAT::triggertypes
$self instvar sim $self instvar sim
$self instvar event_list $self instvar event_list
......
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