citizenaspirant
/
PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch '1060' into v0.6

This commit is contained in:
Peter Šurda 2018-01-25 03:09:47 +01:00
parent d6df4470e1 460107abaa
commit 66b3c6d881
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/class_singleCleaner.py
View File

@ -66,7 +66,7 @@ class singleCleaner(threading.Thread, StoppableThread):
# If we are running as a daemon then we are going to fill up the UI # If we are running as a daemon then we are going to fill up the UI
# queue which will never be handled by a UI. We should clear it to # queue which will never be handled by a UI. We should clear it to
# save memory. # save memory.
if BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon'): if shared.thisapp.daemon:
queues.UISignalQueue.queue.clear() queues.UISignalQueue.queue.clear()
if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380: if timeWeLastClearedInventoryAndPubkeysTables < int(time.time()) - 7380:
timeWeLastClearedInventoryAndPubkeysTables = int(time.time()) timeWeLastClearedInventoryAndPubkeysTables = int(time.time())

4
src/helper_generic.py
View File

@ -6,7 +6,7 @@ from multiprocessing import current_process
from threading import current_thread, enumerate from threading import current_thread, enumerate
import traceback import traceback
from bmconfigparser import BMConfigParser import shared
from debug import logger from debug import logger
import queues import queues
import shutdown import shutdown
@ -54,7 +54,7 @@ def signal_handler(signal, frame):
if current_thread().name not in ("PyBitmessage", "MainThread"): if current_thread().name not in ("PyBitmessage", "MainThread"):
return return
logger.error("Got signal %i", signal) logger.error("Got signal %i", signal)
if BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon'): if shared.thisapp.daemon:
shutdown.doCleanShutdown() shutdown.doCleanShutdown()
else: else:
allThreadTraceback(frame) allThreadTraceback(frame)

3
src/shutdown.py
View File

@ -3,7 +3,6 @@ import Queue
import threading import threading
import time import time
from bmconfigparser import BMConfigParser
from debug import logger from debug import logger
from helper_sql import sqlQuery, sqlStoredProcedure from helper_sql import sqlQuery, sqlStoredProcedure
from helper_threading import StoppableThread from helper_threading import StoppableThread
@ -60,7 +59,7 @@ def doCleanShutdown():
except Queue.Empty: except Queue.Empty:
break break
if BMConfigParser().safeGetBoolean('bitmessagesettings','daemon'): if shared.thisapp.daemon:
logger.info('Clean shutdown complete.') logger.info('Clean shutdown complete.')
shared.thisapp.cleanup() shared.thisapp.cleanup()
os._exit(0) os._exit(0)

8
src/tr.py
View File

@ -1,6 +1,6 @@
import os import os
from bmconfigparser import BMConfigParser import shared
# This is used so that the translateText function can be used when we are in daemon mode and not using any QT functions. # This is used so that the translateText function can be used when we are in daemon mode and not using any QT functions.
class translateClass: class translateClass:
@ -17,7 +17,11 @@ def _translate(context, text, disambiguation = None, encoding = None, n = None):
return translateText(context, text, n) return translateText(context, text, n)
def translateText(context, text, n = None): def translateText(context, text, n = None):
if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'daemon'): try:
is_daemon = shared.thisapp.daemon
except AttributeError: # inside the plugin
is_daemon = False
if not is_daemon:
try: try:
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
except Exception as err: except Exception as err: