projects
/
osm
/
POL.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updating requirements to point to bransh
[osm/POL.git]
/
osm_policy_module
/
alarming
/
service.py
diff --git
a/osm_policy_module/alarming/service.py
b/osm_policy_module/alarming/service.py
index
b93dba7
..
a938234
100644
(file)
--- a/
osm_policy_module/alarming/service.py
+++ b/
osm_policy_module/alarming/service.py
@@
-27,7
+27,7
@@
import json
import logging
import requests
import logging
import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError
, RequestException
from osm_policy_module.common.common_db_client import CommonDbClient
from osm_policy_module.common.lcm_client import LcmClient
from osm_policy_module.common.common_db_client import CommonDbClient
from osm_policy_module.common.lcm_client import LcmClient
@@
-218,6
+218,7
@@
class AlarmingService:
database.db.close()
async def handle_alarm(self, alarm_uuid: str, status: str, payload: dict):
database.db.close()
async def handle_alarm(self, alarm_uuid: str, status: str, payload: dict):
+ alert_timeout = int(self.conf.get('alert', 'timeout'))
database.db.connect()
try:
with database.db.atomic():
database.db.connect()
try:
with database.db.atomic():
@@
-234,7
+235,10
@@
class AlarmingService:
status,
)
try:
status,
)
try:
- requests.post(url=action.url, json=json.dumps(payload))
+ requests.post(url=action.url, json=json.dumps(payload), timeout=alert_timeout)
+ except RequestException as e:
+ log.info("Error: RequestException while connecting to url %s", action.url)
+ log.debug("RequestException %s", e)
except ConnectionError:
log.exception("Error connecting to url %s", action.url)
except ConnectionError:
log.exception("Error connecting to url %s", action.url)