From 764a9b788488d95f291d2d48dfd3207c2bf02b75 Mon Sep 17 00:00:00 2001
From: Florian Mounier <florian.mounier@kozea.fr>
Date: Thu, 21 Aug 2014 16:42:38 +0200
Subject: [PATCH] Remove systemd socket env vars to not fail other systemd
 compatible daemons launched inside butterfly

---
 butterfly.server.py   | 4 ++++
 butterfly/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/butterfly.server.py b/butterfly.server.py
index 8ac4e88..793c796 100755
--- a/butterfly.server.py
+++ b/butterfly.server.py
@@ -228,6 +228,10 @@ http_server.listen(port, address=host)
 url = "http%s://%s:%d/*" % (
     "s" if not tornado.options.options.unsecure else "", host, port)
 
+if http_server.systemd:
+    os.environ.pop('LISTEN_PID')
+    os.environ.pop('LISTEN_FDS')
+
 # This is for debugging purpose
 try:
     from wsreload.client import sporadic_reload, watch
diff --git a/butterfly/__init__.py b/butterfly/__init__.py
index 0da6bb8..483c89b 100644
--- a/butterfly/__init__.py
+++ b/butterfly/__init__.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '1.5.5'
+__version__ = '1.5.6'
 
 
 import os