From 3cb9547389e41bbf8b7cd8e258e91db57614e4b6 Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Thu, 21 Dec 2017 14:26:51 +0100
Subject: [PATCH] Only write PID after last fork

- should fix systemd integration
---
 src/bitmessagemain.py | 2 +-
 src/singleinstance.py | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py
index 83a41919..91032fe5 100755
--- a/src/bitmessagemain.py
+++ b/src/bitmessagemain.py
@@ -363,7 +363,7 @@ class Main:
             # fork not implemented
             pass
         else:
-            shared.thisapp.lock() # relock
+            shared.thisapp.lock(True) # relock and write pid
         shared.thisapp.lockPid = None # indicate we're the final child
         sys.stdout.flush()
         sys.stderr.flush()
diff --git a/src/singleinstance.py b/src/singleinstance.py
index 7a025945..883c83cc 100644
--- a/src/singleinstance.py
+++ b/src/singleinstance.py
@@ -36,7 +36,7 @@ class singleinstance:
         self.initialized = True
         atexit.register(self.cleanup)
 
-    def lock(self):
+    def lock(self, writePid = False):
         if self.lockPid is None:
             self.lockPid = os.getpid()
         if sys.platform == 'win32':
@@ -68,9 +68,10 @@ class singleinstance:
                 sys.exit(-1)
             else:
                 pidLine = "%i\n" % self.lockPid
-                self.fp.truncate(0)
-                self.fp.write(pidLine)
-                self.fp.flush()
+                if writePid:
+                    self.fp.truncate(0)
+                    self.fp.write(pidLine)
+                    self.fp.flush()
 
     def cleanup(self):
         if not self.initialized: