From 594b66236ffaf878a315bc0d0cc47e716e9e042e Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Tue, 28 Mar 2017 12:30:06 +0900
Subject: [PATCH] Prepare 1.0.5

---
 README.rst        | 7 +++++++
 server/env.py     | 6 ++----
 server/version.py | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index d2a9b68..0e144d6 100644
--- a/README.rst
+++ b/README.rst
@@ -127,6 +127,12 @@ Roadmap
 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
 -------------
 
@@ -226,6 +232,7 @@ documentation updates.
 .. _#152: https://github.com/kyuupichan/electrumx/issues/152
 .. _#157: https://github.com/kyuupichan/electrumx/issues/157
 .. _#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/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
diff --git a/server/env.py b/server/env.py
index dbbc78d..e27d1c6 100644
--- a/server/env.py
+++ b/server/env.py
@@ -78,8 +78,6 @@ class Env(LoggedClass):
             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:
             raise self.Error('REPORT_TCP_PORT and REPORT_SSL_PORT are both {}'
                              .format(main_identity.tcp_port))
@@ -137,11 +135,11 @@ class Env(LoggedClass):
         try:
             ip = ip_address(host)
         except ValueError:
-            bad = not bool(host)
+            bad = not bool(host.strip())
         else:
             bad = ip.is_multicast or ip.is_unspecified
         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):
         bad = [envvar for envvar in envvars if environ.get(envvar)]
diff --git a/server/version.py b/server/version.py
index 855964b..38899b1 100644
--- a/server/version.py
+++ b/server/version.py
@@ -1,5 +1,5 @@
 # Server name and protocol versions
 
-VERSION = 'ElectrumX 1.0.4'
+VERSION = 'ElectrumX 1.0.5'
 PROTOCOL_MIN = '1.0'
 PROTOCOL_MAX = '1.0'