Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #200 - Move SLE class vars to instance vars #202

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Issue #200 - Move SLE class vars to instance vars #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions ait/dsn/sle/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
import gevent.queue
import gevent.socket
import gevent.select
import gevent.monkey; gevent.monkey.patch_all()
import gevent.monkey; gevent.monkey.patch_time()

import pyasn1.error
from pyasn1.codec.ber.encoder import encode
Expand Down Expand Up @@ -92,13 +92,13 @@ class SLE(object):
for interfacing with SLE.

'''
_state = 'unbound'
_handlers = defaultdict(list)
_data_queue = gevent.queue.Queue()
_invoke_id = 0

def __init__(self, *args, **kwargs):
''''''
self._state = 'unbound'
self._handlers = defaultdict(list)
self._data_queue = gevent.queue.Queue()
self._invoke_id = 0
self._downlink_frame_type = ait.config.get('dsn.sle.downlink_frame_type',
kwargs.get('downlink_frame_type', 'TMTransFrame'))
self._heartbeat = ait.config.get('dsn.sle.heartbeat',
Expand All @@ -117,7 +117,6 @@ def __init__(self, *args, **kwargs):
kwargs.get('peer_password', None))
self._responder_port = ait.config.get('dsn.sle.responder_port',
kwargs.get('responder_port', 'default'))
self._telem_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self._auth_level = ait.config.get('dsn.sle.auth_level',
kwargs.get('auth_level', 'none'))

Expand Down Expand Up @@ -166,9 +165,11 @@ def send(self, data):
for i in writeable:
i.sendall(data)
except socket.error as e:
self._state = 'unbound'
if e.errno == errno.ECONNRESET:
ait.core.log.error('Socket connection lost to DSN')
self._socket.close()
self._socket = None
else:
ait.core.log.error('Unexpected error encountered when sending data. Aborting ...')
raise e
Expand Down Expand Up @@ -306,6 +307,8 @@ def connect(self):
ait.core.log.error('Connection failure with DSN. Aborting ...')
raise Exception('Unable to connect to DSN through any provided hostnames.')

self._telem_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
ait.core.log.info("Starting conn monitor for %s", type(self))
self._conn_monitor = gevent.spawn(conn_handler, self)
self._data_processor = gevent.spawn(data_processor, self)

Expand Down Expand Up @@ -335,7 +338,9 @@ def disconnect(self):
greenlets for monitoring and processing data.
'''
self._socket.close()
self._socket = None
self._telem_sock.close()
self._telem_sock = None
self._conn_monitor.kill()
self._data_processor.kill()

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

setup(
name = 'ait-dsn',
version = '2.0.1-rc1',
version = '2.0.2',
description = description,
long_description = long_description,
long_description_content_type = 'text/x-rst',
Expand Down