git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[myslice.git]
/
rest
/
monitor.py
diff --git
a/rest/monitor.py
b/rest/monitor.py
index
2252189
..
7729549
100644
(file)
--- a/
rest/monitor.py
+++ b/
rest/monitor.py
@@
-7,7
+7,7
@@
import ConfigParser
def servicesStatus(request):
Config = ConfigParser.ConfigParser()
def servicesStatus(request):
Config = ConfigParser.ConfigParser()
- Config.read(os.getcwd() + "/myslice/monitor.ini")
+ Config.read(os.getcwd() + "/myslice/m
yslice/m
onitor.ini")
result = {}
result = {}
@@
-16,15
+16,15
@@
def servicesStatus(request):
cert = os.path.abspath(Config.get('monitor', 'cert'))
if not os.path.isfile(cert) :
cert = os.path.abspath(Config.get('monitor', 'cert'))
if not os.path.isfile(cert) :
- return HttpResponse(json.dumps({'error' : '-
1
'}), content_type="application/json")
+ return HttpResponse(json.dumps({'error' : '-
2
'}), content_type="application/json")
if not Config.has_option('monitor', 'pkey') :
if not Config.has_option('monitor', 'pkey') :
- return HttpResponse(json.dumps({'error' : '-
2
'}), content_type="application/json")
+ return HttpResponse(json.dumps({'error' : '-
3
'}), content_type="application/json")
pkey = os.path.abspath(Config.get('monitor', 'pkey'))
if not os.path.isfile(pkey) :
pkey = os.path.abspath(Config.get('monitor', 'pkey'))
if not os.path.isfile(pkey) :
- return HttpResponse(json.dumps({'error' : '-
2
'}), content_type="application/json")
+ return HttpResponse(json.dumps({'error' : '-
4
'}), content_type="application/json")
services = Config.sections()
for s in services :
services = Config.sections()
for s in services :
@@
-59,4
+59,4
@@
def servicesStatus(request):
result[s]['status'] = 'ko'
result[s]['status'] = 'ko'
- return HttpResponse(json.dumps(result), content_type="application/json")
\ No newline at end of file
+ return HttpResponse(json.dumps(result), content_type="application/json")