Skip to content

Commit

Permalink
updates to changelog, contributors; bump version; close #99
Browse files Browse the repository at this point in the history
  • Loading branch information
tomerfiliba committed Nov 26, 2012
1 parent 67fbee0 commit 0f7889b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -21,6 +21,20 @@
reactor thread" that handles all incoming transport from all connections. This should solve
all threading issues once and for all.

3.2.3
-----
* Fix (`issue #76 <https://github.com/tomerfiliba/rpyc/issues/76>`_) for real this time

* Fix issue with ``BgServingThread`` (`#89 <https://github.com/tomerfiliba/rpyc/issues/89>`_)

* Fix issue with ``ThreadPoolServer`` (`#91 <https://github.com/tomerfiliba/rpyc/issues/91>`_)

* Remove RPyC's ``excepthook`` in favor of chaining the exception's remote tracebacks in the
exception class' ``__str__`` method. This solves numerous issues with logging and debugging.

* Add ``OneShotServer``

* Add `UNIX domain sockets <https://github.com/tomerfiliba/rpyc/pull/100>`_

3.2.2
-----
Expand Down
5 changes: 5 additions & 0 deletions CONTRIBUTORS.rst
@@ -1,3 +1,8 @@
v3.2.3
^^^^^^
* Guy Rozendorn - backported lots of fixes from 3.3 branch
* Alon Horev - UNIX domain socket patch

v3.2.2
^^^^^^
* Rotem Yaari - Add logging of exceptions to the protocol layer, investigate ``EINTR`` issue
Expand Down
8 changes: 6 additions & 2 deletions rpyc/utils/registry.py
Expand Up @@ -171,12 +171,14 @@ class UDPRegistryServer(RegistryServer):
"""UDP-based registry server. The server listens to UDP broadcasts and
answers them. Useful in local networks, were broadcasts are allowed"""

TIMEOUT = 1.0

def __init__(self, host = "0.0.0.0", port = REGISTRY_PORT, pruning_timeout = None, logger = None):
family, socktype, proto, _, sockaddr = socket.getaddrinfo(host, port, 0,
socket.SOCK_DGRAM)[0]
sock = socket.socket(family, socktype, proto)
sock.bind(sockaddr)
sock.settimeout(0.5)
sock.settimeout(self.TIMEOUT)
RegistryServer.__init__(self, sock, pruning_timeout = pruning_timeout,
logger = logger)

Expand All @@ -196,6 +198,8 @@ class TCPRegistryServer(RegistryServer):
"""TCP-based registry server. The server listens to a certain TCP port and
answers requests. Useful when you need to cross routers in the network, since
they block UDP broadcasts"""

TIMEOUT = 3.0

def __init__(self, host = "0.0.0.0", port = REGISTRY_PORT, pruning_timeout = None,
logger = None, reuse_addr = True):
Expand All @@ -208,7 +212,7 @@ def __init__(self, host = "0.0.0.0", port = REGISTRY_PORT, pruning_timeout = Non
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind(sockaddr)
sock.listen(10)
sock.settimeout(0.5)
sock.settimeout(self.TIMEOUT)
RegistryServer.__init__(self, sock, pruning_timeout = pruning_timeout,
logger = logger)
self._connected_sockets = {}
Expand Down
2 changes: 1 addition & 1 deletion rpyc/version.py
@@ -1,4 +1,4 @@
version = (3, 3, 0)
version_string = "3.3.0"
release_date = "2012.12.01"
release_date = "2013.02.01"

0 comments on commit 0f7889b

Please sign in to comment.