RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare 1.0.5

Browse Source
This commit is contained in:
Neil Booth 2017-03-28 12:30:06 +09:00
parent 8e00affc1a
commit 594b66236f
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.rst
View File

@ -127,6 +127,12 @@ Roadmap
ChangeLog ChangeLog
========= =========
Version 1.0.5
-------------
* the peer looping was actually just looping of logging output, not
connections. Hopefully fixed for good in this release. Closes `#160`_.
Version 1.0.4 Version 1.0.4
------------- -------------
@ -226,6 +232,7 @@ documentation updates.
.. _#152: https://github.com/kyuupichan/electrumx/issues/152 .. _#152: https://github.com/kyuupichan/electrumx/issues/152
.. _#157: https://github.com/kyuupichan/electrumx/issues/157 .. _#157: https://github.com/kyuupichan/electrumx/issues/157
.. _#158: https://github.com/kyuupichan/electrumx/issues/158 .. _#158: https://github.com/kyuupichan/electrumx/issues/158
.. _#160: https://github.com/kyuupichan/electrumx/issues/160
.. _docs/HOWTO.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/HOWTO.rst .. _docs/HOWTO.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/HOWTO.rst
.. _docs/ENVIRONMENT.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/ENVIRONMENT.rst .. _docs/ENVIRONMENT.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/ENVIRONMENT.rst
.. _docs/PEER_DISCOVERY.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/PEER_DISCOVERY.rst .. _docs/PEER_DISCOVERY.rst: https://github.com/kyuupichan/electrumx/blob/master/docs/PEER_DISCOVERY.rst

6
server/env.py
View File

@ -78,8 +78,6 @@ class Env(LoggedClass):
self.integer('REPORT_SSL_PORT', self.ssl_port) or None, self.integer('REPORT_SSL_PORT', self.ssl_port) or None,
'' ''
) )
if not main_identity.host.strip():
raise self.Error('REPORT_HOST host is empty')
if main_identity.tcp_port == main_identity.ssl_port: if main_identity.tcp_port == main_identity.ssl_port:
raise self.Error('REPORT_TCP_PORT and REPORT_SSL_PORT are both {}' raise self.Error('REPORT_TCP_PORT and REPORT_SSL_PORT are both {}'
.format(main_identity.tcp_port)) .format(main_identity.tcp_port))
@ -137,11 +135,11 @@ class Env(LoggedClass):
try: try:
ip = ip_address(host) ip = ip_address(host)
except ValueError: except ValueError:
bad = not bool(host) bad = not bool(host.strip())
else: else:
bad = ip.is_multicast or ip.is_unspecified bad = ip.is_multicast or ip.is_unspecified
if bad: if bad:
raise self.Error('{} is not a valid REPORT_HOST'.format(host)) raise self.Error('"{}" is not a valid REPORT_HOST'.format(host))
def obsolete(self, envvars): def obsolete(self, envvars):
bad = [envvar for envvar in envvars if environ.get(envvar)] bad = [envvar for envvar in envvars if environ.get(envvar)]

2
server/version.py
View File

@ -1,5 +1,5 @@
# Server name and protocol versions # Server name and protocol versions
VERSION = 'ElectrumX 1.0.4' VERSION = 'ElectrumX 1.0.5'
PROTOCOL_MIN = '1.0' PROTOCOL_MIN = '1.0'
PROTOCOL_MAX = '1.0' PROTOCOL_MAX = '1.0'