Skip to content

Commit 15b218c

Browse files
f5-rahmzhanghui
authored andcommitted
Issue #1517 - Remove SIGALRM signal
(cherry picked from commit f5babbb) Files Changed - f5/bigip/__init__.py
1 parent bc45f10 commit 15b218c

1 file changed

Lines changed: 23 additions & 13 deletions

File tree

f5/bigip/__init__.py

Lines changed: 23 additions & 13 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
@@ -116,13 +116,23 @@ def post_configuration_setup(self):
116116
def _get_tmos_version(self):
117117
connect = self._meta_data['bigip']._meta_data['icr_session']
118118
base_uri = self._meta_data['uri'] + 'tm/sys/'
119-
if HAS_SIGNAL:
120-
signal.signal(SIGALRM, timeout_handler)
121-
signal.alarm(int(self.args['timeout']))
122-
response = connect.get(base_uri)
123-
signal.alarm(0)
124-
else:
125-
response = connect.get(base_uri)
119+
# try:
120+
# if HAS_SIGNAL:
121+
# signal.signal(SIGALRM, timeout_handler)
122+
# signal.alarm(int(self.args['timeout']))
123+
# response = connect.get(base_uri)
124+
# signal.alarm(0)
125+
# else:
126+
# response = connect.get(base_uri)
127+
# except ValueError:
128+
# # Flask raises this when running F5-SDK in an instance
129+
# response = connect.get(base_uri)
130+
131+
##
132+
# Adding while commenting out SIGALRM - JER 2/8/2019
133+
response = connect.get(base_uri)
134+
##
135+
126136
ver = response.json()
127137
version = urlparse.parse_qs(
128138
urlparse.urlparse(ver['selfLink']).query)['ver'][0]

0 commit comments

Comments
 (0)