Skip to content

Commit f5babbb

Browse files
committed
Issue #1517 - Remove SIGALRM signal
Files Changed - f5/bigip/__init__.py
1 parent c831fe4 commit f5babbb

1 file changed

Lines changed: 23 additions & 17 deletions

File tree

f5/bigip/__init__.py

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
except ImportError:
2424
import urllib.parse as urlparse
2525

26-
try:
27-
import signal
28-
from signal import SIGALRM
29-
HAS_SIGNAL = True
30-
except ImportError:
31-
HAS_SIGNAL = False
26+
# try:
27+
# import signal
28+
# from signal import SIGALRM
29+
# HAS_SIGNAL = True
30+
# except ImportError:
31+
# HAS_SIGNAL = False
3232

3333
from f5.bigip.cm import Cm
3434
from f5.bigip.resource import PathElement
@@ -118,17 +118,23 @@ def post_configuration_setup(self):
118118
def _get_tmos_version(self):
119119
connect = self._meta_data['bigip']._meta_data['icr_session']
120120
base_uri = self._meta_data['uri'] + 'tm/sys/'
121-
try:
122-
if HAS_SIGNAL:
123-
signal.signal(SIGALRM, timeout_handler)
124-
signal.alarm(int(self.args['timeout']))
125-
response = connect.get(base_uri)
126-
signal.alarm(0)
127-
else:
128-
response = connect.get(base_uri)
129-
except ValueError:
130-
# Flask raises this when running F5-SDK in an instance
131-
response = connect.get(base_uri)
121+
# try:
122+
# if HAS_SIGNAL:
123+
# signal.signal(SIGALRM, timeout_handler)
124+
# signal.alarm(int(self.args['timeout']))
125+
# response = connect.get(base_uri)
126+
# signal.alarm(0)
127+
# else:
128+
# response = connect.get(base_uri)
129+
# except ValueError:
130+
# # Flask raises this when running F5-SDK in an instance
131+
# response = connect.get(base_uri)
132+
133+
##
134+
# Adding while commenting out SIGALRM - JER 2/8/2019
135+
response = connect.get(base_uri)
136+
##
137+
132138
ver = response.json()
133139
version = urlparse.parse_qs(
134140
urlparse.urlparse(ver['selfLink']).query)['ver'][0]

0 commit comments

Comments
 (0)