Merge pull request #377 from merlink01/master
Changed start code for deamon mode
This commit is contained in:
commit
741e27eb85
|
@ -770,7 +770,8 @@ if shared.useVeryEasyProofOfWorkForTesting:
|
|||
shared.networkDefaultPayloadLengthExtraBytes = int(
|
||||
shared.networkDefaultPayloadLengthExtraBytes / 7000)
|
||||
|
||||
if __name__ == "__main__":
|
||||
class Main:
|
||||
def start(self, deamon=False):
|
||||
# is the application already running? If yes then exit.
|
||||
thisapp = singleton.singleinstance()
|
||||
|
||||
|
@ -823,7 +824,7 @@ if __name__ == "__main__":
|
|||
singleListenerThread.daemon = True # close the main program even if there are threads left
|
||||
singleListenerThread.start()
|
||||
|
||||
if not shared.safeConfigGetBoolean('bitmessagesettings', 'daemon'):
|
||||
if deamon == False and shared.safeConfigGetBoolean('bitmessagesettings', 'daemon') == False:
|
||||
try:
|
||||
from PyQt4 import QtCore, QtGui
|
||||
except Exception as err:
|
||||
|
@ -835,12 +836,35 @@ if __name__ == "__main__":
|
|||
bitmessageqt.run()
|
||||
else:
|
||||
shared.config.remove_option('bitmessagesettings', 'dontconnect')
|
||||
|
||||
if deamon:
|
||||
with shared.printLock:
|
||||
print 'Running as a daemon. The main program should exit this thread.'
|
||||
else:
|
||||
with shared.printLock:
|
||||
print 'Running as a daemon. You can use Ctrl+C to exit.'
|
||||
|
||||
while True:
|
||||
time.sleep(20)
|
||||
|
||||
def stop(self):
|
||||
with shared.printLock:
|
||||
print 'Stopping Bitmessage Deamon.'
|
||||
shared.doCleanShutdown()
|
||||
|
||||
|
||||
def getApiAddress(self):
|
||||
if not shared.safeConfigGetBoolean('bitmessagesettings', 'apienabled'):
|
||||
return None
|
||||
|
||||
address = shared.config.get('bitmessagesettings', 'apiinterface')
|
||||
port = shared.config.getint('bitmessagesettings', 'apiport')
|
||||
return {'address':address,'port':port}
|
||||
|
||||
if __name__ == "__main__":
|
||||
mainprogram = Main()
|
||||
mainprogram.start()
|
||||
|
||||
|
||||
# So far, the creation of and management of the Bitmessage protocol and this
|
||||
# client is a one-man operation. Bitcoin tips are quite appreciated.
|
||||
# 1H5XaDA6fYENLbknwZyjiYXYPQaFjjLX2u
|
||||
|
|
Loading…
Reference in New Issue
Block a user