Skip to content

Don't propagate loggers; add some logging. #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Atheros1 merged 2 commits into from
Jul 13, 2013
+30 −30
Merged

Don't propagate loggers; add some logging. #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e2db97
Don't propagate loggers; add some logging.
fiatflux Jul 10, 2013
3179ea3
These changes slipped from last commit. Sorry.
fiatflux Jul 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/debug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@
'loggers': {
'console_only': {
'handlers': ['console'],
'propagate' : 0
},
'file_only': {
'handlers': ['file'],
'propagate' : 0
},
'both': {
'handlers': ['console', 'file'],
'propagate' : 0
},
},
'root': {
Expand Down
57 changes: 27 additions & 30 deletions src/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import random
import highlevelcrypto
import shared
from debug import logger

config = ConfigParser.SafeConfigParser()
myECCryptorObjects = {}
Expand Down Expand Up @@ -118,7 +119,8 @@ def lookupAppdataFolder():
if "HOME" in environ:
dataFolder = path.join(os.environ["HOME"], "Library/Application Support/", APPNAME) + '/'
else:
print 'Could not find home folder, please report this message and your OS X version to the BitMessage Github.'
logger.critical('Could not find home folder, please report this message and your '
'OS X version to the BitMessage Github.')
sys.exit()

elif 'win32' in sys.platform or 'win64' in sys.platform:
Expand All @@ -129,13 +131,14 @@ def lookupAppdataFolder():
dataFolder = path.join(environ["XDG_CONFIG_HOME"], APPNAME)
except KeyError:
dataFolder = path.join(environ["HOME"], ".config", APPNAME)

# Migrate existing data to the proper location if this is an existing install
try:
print "Moving data folder to ~/.config/%s" % APPNAME
logger.info("Moving data folder to %s" % (dataFolder))
move(path.join(environ["HOME"], ".%s" % APPNAME), dataFolder)
dataFolder = dataFolder + '/'
except IOError:
dataFolder = dataFolder + '/'
pass
Copy link
Copy Markdown
Contributor Author

@fiatflux fiatflux Jul 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@XJ9: What makes IOError an exception we should catch?

Copy link
Copy Markdown
Contributor

@r14c r14c Jul 10, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fiatflux Python throws IOError if there is no old config directory.

Copy link
Copy Markdown
Contributor Author

@fiatflux fiatflux Jul 11, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, of course. Thanks. Later today I'll add a comment to that effect or switch away from the use of exceptions for this case.

dataFolder = dataFolder + '/'
return dataFolder

def isAddressInMyAddressBook(address):
Expand Down Expand Up @@ -200,9 +203,7 @@ def decodeWalletImportFormat(WIFstring):


def reloadMyAddressHashes():
printLock.acquire()
print 'reloading keys from keys.dat file'
printLock.release()
logger.debug('reloading keys from keys.dat file')
myECCryptorObjects.clear()
myAddressesByHash.clear()
#myPrivateKeys.clear()
Expand All @@ -221,9 +222,7 @@ def reloadMyAddressHashes():
sys.stderr.write('Error in reloadMyAddressHashes: Can\'t handle address versions other than 2 or 3.\n')

def reloadBroadcastSendersForWhichImWatching():
printLock.acquire()
print 'reloading subscriptions...'
printLock.release()
logger.debug('reloading subscriptions...')
broadcastSendersForWhichImWatching.clear()
MyECSubscriptionCryptorObjects.clear()
sqlLock.acquire()
Expand All @@ -246,46 +245,44 @@ def doCleanShutdown():
knownNodesLock.acquire()
UISignalQueue.put(('updateStatusBar','Saving the knownNodes list of peers to disk...'))
output = open(appdata + 'knownnodes.dat', 'wb')
print 'finished opening knownnodes.dat. Now pickle.dump'
logger.info('finished opening knownnodes.dat. Now pickle.dump')
pickle.dump(knownNodes, output)
print 'Completed pickle.dump. Closing output...'
logger.info('Completed pickle.dump. Closing output...')
output.close()
knownNodesLock.release()
printLock.acquire()
print 'Finished closing knownnodes.dat output file.'
printLock.release()
logger.info('Finished closing knownnodes.dat output file.')
UISignalQueue.put(('updateStatusBar','Done saving the knownNodes list of peers to disk.'))

broadcastToSendDataQueues((0, 'shutdown', 'all'))

printLock.acquire()
print 'Flushing inventory in memory out to disk...'
printLock.release()
UISignalQueue.put(('updateStatusBar','Flushing inventory in memory out to disk. This should normally only take a second...'))
logger.info('Flushing inventory in memory out to disk...')
UISignalQueue.put((
'updateStatusBar',
'Flushing inventory in memory out to disk. This should normally only take a second...'))
flushInventory()

#This one last useless query will guarantee that the previous flush committed before we close the program.
# This one last useless query will guarantee that the previous flush committed before we close
# the program.
sqlLock.acquire()
sqlSubmitQueue.put('SELECT address FROM subscriptions')
sqlSubmitQueue.put('')
sqlReturnQueue.get()
sqlSubmitQueue.put('exit')
sqlLock.release()
printLock.acquire()
print 'Finished flushing inventory.'
printLock.release()

time.sleep(.25) #Wait long enough to guarantee that any running proof of work worker threads will check the shutdown variable and exit. If the main thread closes before they do then they won't stop.
logger.info('Finished flushing inventory.')
# Wait long enough to guarantee that any running proof of work worker threads will check the
# shutdown variable and exit. If the main thread closes before they do then they won't stop.
time.sleep(.25)

if safeConfigGetBoolean('bitmessagesettings','daemon'):
printLock.acquire()
print 'Done.'
printLock.release()
logger.info('Clean shutdown complete.')
os._exit(0)

#When you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
# When you want to command a sendDataThread to do something, like shutdown or send some data, this
# function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are
# responsible for putting their queue into (and out of) the sendDataQueues list.
def broadcastToSendDataQueues(data):
#print 'running broadcastToSendDataQueues'
# logger.debug('running broadcastToSendDataQueues')
for q in sendDataQueues:
q.put((data))

Expand Down