git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit changes the 'soltesz.py' module into 'moncommands.py' and
[monitor.git]
/
nodecommon.py
diff --git
a/nodecommon.py
b/nodecommon.py
index
3256b69
..
9469b81
100644
(file)
--- a/
nodecommon.py
+++ b/
nodecommon.py
@@
-128,10
+128,10
@@
def nodegroup_display(node, fb, conf=None):
return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)20.20s... %(kernel)43s %(lastupdate)12s " % node
from model import *
return "%(hostname)-42s %(boot_state)8s %(current)5s %(pcu)6s %(key)20.20s... %(kernel)43s %(lastupdate)12s " % node
from model import *
-import
soltesz
+import
database
def node_end_record(node):
def node_end_record(node):
- act_all =
soltesz
.dbLoad("act_all")
+ act_all =
database
.dbLoad("act_all")
if node not in act_all:
del act_all
return False
if node not in act_all:
del act_all
return False
@@
-152,7
+152,7
@@
def node_end_record(node):
rec['stage'] = "monitor-end-record"
rec['time'] = time.time() - 7*60*60*24
act_all[node].insert(0,rec)
rec['stage'] = "monitor-end-record"
rec['time'] = time.time() - 7*60*60*24
act_all[node].insert(0,rec)
-
soltesz
.dbDump("act_all", act_all)
+
database
.dbDump("act_all", act_all)
del act_all
return True
del act_all
return True