projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix(aiokafka): version now fixed to 0.6.0 (this is the latest at the moment)
[osm/POL.git]
/
osm_policy_module
/
cmd
/
policy_module_healthcheck.py
diff --git
a/osm_policy_module/cmd/policy_module_healthcheck.py
b/osm_policy_module/cmd/policy_module_healthcheck.py
index
e10776f
..
de85ad0
100644
(file)
--- a/
osm_policy_module/cmd/policy_module_healthcheck.py
+++ b/
osm_policy_module/cmd/policy_module_healthcheck.py
@@
-20,14
+20,10
@@
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
import argparse
# contact: bdiaz@whitestack.com or glavado@whitestack.com
##
import argparse
-import asyncio
import logging
import subprocess
import sys
import logging
import subprocess
import sys
-
-from aiokafka import AIOKafkaConsumer
-
-from osm_policy_module.core.config import Config
+import os
log = logging.getLogger(__name__)
log = logging.getLogger(__name__)
@@
-35,13
+31,11
@@
log = logging.getLogger(__name__)
def main():
parser = argparse.ArgumentParser(prog='osm-policy-healthcheck')
parser.add_argument('--config-file', nargs='?', help='POL configuration file')
def main():
parser = argparse.ArgumentParser(prog='osm-policy-healthcheck')
parser.add_argument('--config-file', nargs='?', help='POL configuration file')
- args = parser.parse_args()
- cfg = Config(args.config_file)
+
#
args = parser.parse_args()
+
#
cfg = Config(args.config_file)
if not _processes_running():
sys.exit(1)
if not _processes_running():
sys.exit(1)
- if not _is_kafka_ok(cfg.get('message', 'host'), cfg.get('message', 'port')):
- sys.exit(1)
sys.exit(0)
sys.exit(0)
@@
-57,24
+51,13
@@
def _processes_running():
processes_running = ps.decode().split('\n')
for p in processes_to_check:
if not _contains_process(processes_running, p):
processes_running = ps.decode().split('\n')
for p in processes_to_check:
if not _contains_process(processes_running, p):
+ log.error("Process %s not running!" % p)
return False
return False
- return True
-
-
-def _is_kafka_ok(host, port):
- async def _test_kafka(loop):
- consumer = AIOKafkaConsumer(
- 'healthcheck',
- loop=loop, bootstrap_servers='{}:{}'.format(host, port))
- await consumer.start()
- await consumer.stop()
- try:
- loop = asyncio.get_event_loop()
- loop.run_until_complete(_test_kafka(loop))
+ # Check if process is running properly (listening to kafka bus)
+ if os.path.exists('/tmp/osm_pol_agent_health_flag'):
return True
return True
- except Exception:
- log.exception("POL can not connect to Kafka")
+ else:
return False
return False