def __get_uptimes(self):
if not hasattr(self, '_uptimes'):
- self._uptimes = getUptimes(self.machines)
+ self._uptimes = getUptimes(Machine.select())
return self._uptimes
uptimes = property(__get_uptimes)
stack[-1].extend(v.split())
return stack[-1]
-def getUptimes(machines):
+def getUptimes(machines=None):
"""Return a dictionary mapping machine names to uptime strings"""
value_string = remctl('web', 'listvms')
lines = value_string.splitlines()
default_disk=min(4.0, max_disk),
machines=machines,
has_vnc=has_vnc,
- uptimes=uptimes,
+ uptimes=g.uptimes,
cdroms=CDROM.select())
return Template(file='list.tmpl', searchList=[d, global_dict])
def command(user, fields):
"""Handler for running commands like boot and delete on a VM."""
- print time.time()-start_time
+ print >> sys.stderr, time.time()-start_time
machine = testMachineId(user, fields.getfirst('machine_id'))
action = fields.getfirst('action')
cdrom = fields.getfirst('cdrom')
- print time.time()-start_time
+ print >> sys.stderr, time.time()-start_time
if cdrom is not None and not CDROM.get(cdrom):
raise CodeError("Invalid cdrom type '%s'" % cdrom)
if action not in ('Reboot', 'Power on', 'Power off', 'Shutdown', 'Delete VM'):
remctl('shutdown', machine.name)
elif action == 'Delete VM':
deleteVM(machine)
- print time.time()-start_time
+ print >> sys.stderr, time.time()-start_time
d = dict(user=user,
command=action,
u.email = 'nobody'
connect('postgres://sipb-xen@sipb-xen-dev/sipb_xen')
operation = os.environ.get('PATH_INFO', '')
- #print 'Content-Type: text/plain\n'
- #print operation
+# print 'Content-Type: text/plain\n'
+# print operation
if not operation:
print "Status: 301 Moved Permanently"
print 'Location: ' + os.environ['SCRIPT_NAME']+'/\n'
operation = operation[1:]
if not operation:
operation = 'list'
-
+
def badOperation(u, e):
raise CodeError("Unknown operation")
sys.stderr.seek(0)
e = sys.stderr.read()
if e:
- output = output.replace('<body>', '<body><pre>'+e+'</pre>')
+ output = str(output)
+ output = output.replace('<body>', '<body><p>STDERR:</p><pre>'+e+'</pre>')
print output
except CodeError, err:
print 'Content-Type: text/html\n'
sys.stderr.seek(0)
e = sys.stderr.read()
+ sys.stderr=sys.stdout
print error(operation, u, fields, err, e)
except InvalidInput, err:
print 'Content-Type: text/html\n'
sys.stderr.seek(0)
e = sys.stderr.read()
+ sys.stderr=sys.stdout
print invalidInput(operation, u, fields, err, e)
except:
print 'Content-Type: text/plain\n'
e = sys.stderr.read()
print e
print '----'
+ sys.stderr = sys.stdout
raise
projects / invirt/packages/invirt-web.git / commitdiff
