git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ReCreate. Also added try catch to api eval of rpc method.
[nodemanager.git]
/
nm.py
diff --git
a/nm.py
b/nm.py
index
46f23f5
..
8ad5e65
100644
(file)
--- a/
nm.py
+++ b/
nm.py
@@
-1,5
+1,7
@@
#!/usr/bin/python
#!/usr/bin/python
+# $Id: nm.py,v 1.15.2.8 2007/09/04 20:50:30 faiyaza Exp $
+
"""Node Manager"""
import optparse
"""Node Manager"""
import optparse
@@
-16,6
+18,7
@@
import tools
from config import Config
from plcapi import PLCAPI
import random
from config import Config
from plcapi import PLCAPI
import random
+import net
savedargv = sys.argv[:]
savedargv = sys.argv[:]
@@
-30,14
+33,17
@@
parser.add_option('-p', '--period', action='store', dest='period', default=600,
modules = []
def GetSlivers(plc):
modules = []
def GetSlivers(plc):
- data = plc.GetSlivers()
- # net needs access to API for i2 nodes.
+ try: data = plc.GetSlivers()
+ except: logger.log_exc()
+ # Set i2 ip list for nodes in I2 nodegroup.
+ try: net.GetSlivers(plc, data)
+ except: logger.log_exc()
+ # All other callback modules
for module in modules:
for module in modules:
- if module.__name__ == 'net':
- module.GetSlivers(plc, data)
- else:
+ try:
callback = getattr(module, 'GetSlivers')
callback(data)
callback = getattr(module, 'GetSlivers')
callback(data)
+ except: logger.log_exc()
def run():
try:
def run():
try:
@@
-55,7
+61,7
@@
def run():
print "Warning while writing PID file:", err
# Load and start modules
print "Warning while writing PID file:", err
# Load and start modules
- for module in ['
net', 'proper', 'conf_files', 'sm
']:
+ for module in ['
proper', 'conf_files', 'sm', 'bwmon
']:
try:
m = __import__(module)
m.start(options, config)
try:
m = __import__(module)
m.start(options, config)
@@
-73,8
+79,8
@@
def run():
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
while True:
plc = PLCAPI(config.plc_api_uri, config.cacert, session, timeout=options.period/2)
while True:
- try: GetSlivers(plc)
-
except: logger.log_exc(
)
+ # Main NM Loop
+
GetSlivers(plc
)
time.sleep(options.period + random.randrange(0,301))
except: logger.log_exc()
time.sleep(options.period + random.randrange(0,301))
except: logger.log_exc()