From d497e89b2b30d4a08735c900fd1f9853d7b83220 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Sun, 29 Nov 2015 15:56:38 +0100
Subject: [PATCH] use logging.getLogger(__name__)

---
 oml/directory.py         | 2 +-
 oml/downloads.py         | 2 +-
 oml/item/api.py          | 2 +-
 oml/item/handlers.py     | 2 +-
 oml/item/icons.py        | 2 +-
 oml/item/models.py       | 2 +-
 oml/item/person_api.py   | 2 +-
 oml/item/scan.py         | 2 +-
 oml/item/title_api.py    | 2 +-
 oml/localnodes.py        | 7 ++++++-
 oml/media/epub.py        | 2 +-
 oml/media/pdf.py         | 2 +-
 oml/meta/__init__.py     | 2 +-
 oml/meta/abebooks.py     | 2 +-
 oml/meta/duckduckgo.py   | 2 +-
 oml/meta/google.py       | 2 +-
 oml/meta/loc.py          | 2 +-
 oml/meta/lookupbyisbn.py | 2 +-
 oml/meta/openlibrary.py  | 2 +-
 oml/meta/worldcat.py     | 2 +-
 oml/metaremote.py        | 2 +-
 oml/metaserver.py        | 2 +-
 oml/node/nodeapi.py      | 2 +-
 oml/node/server.py       | 2 +-
 oml/nodes.py             | 2 +-
 oml/oxtornado.py         | 2 +-
 oml/queryparser.py       | 2 +-
 oml/server.py            | 7 +++++--
 oml/ssl_request.py       | 2 +-
 oml/tasks.py             | 2 +-
 oml/tor.py               | 6 +++---
 oml/tor_request.py       | 2 +-
 oml/user/api.py          | 2 +-
 oml/user/models.py       | 2 +-
 oml/utils.py             | 2 +-
 oml/websocket.py         | 2 +-
 36 files changed, 47 insertions(+), 39 deletions(-)

diff --git a/oml/directory.py b/oml/directory.py
index aa7b4b6..63ae456 100644
--- a/oml/directory.py
+++ b/oml/directory.py
@@ -11,7 +11,7 @@ import tor_request
 
 import settings
 
-logger = logging.getLogger('oml.directory')
+logger = logging.getLogger(__name__)
 
 base = settings.server['directory_service']
 base = 'http://hpjats6xixrleoqg.onion:25519'
diff --git a/oml/downloads.py b/oml/downloads.py
index 2994a54..9ce193e 100644
--- a/oml/downloads.py
+++ b/oml/downloads.py
@@ -13,7 +13,7 @@ import update
 from websocket import trigger_event
 
 import logging
-logger = logging.getLogger('oml.downloads')
+logger = logging.getLogger(__name__)
 
 class Downloads(Thread):
 
diff --git a/oml/item/api.py b/oml/item/api.py
index 7f7285c..badd4b6 100644
--- a/oml/item/api.py
+++ b/oml/item/api.py
@@ -21,7 +21,7 @@ from . import person_api
 from . import title_api
 
 import logging
-logger = logging.getLogger('oml.item.api')
+logger = logging.getLogger(__name__)
 
 
 def find(data):
diff --git a/oml/item/handlers.py b/oml/item/handlers.py
index 64d58ec..a2f3dcd 100644
--- a/oml/item/handlers.py
+++ b/oml/item/handlers.py
@@ -24,7 +24,7 @@ from oxtornado import json_dumps, json_response
 from media import get_id
 
 import logging
-logger = logging.getLogger('item.handlers')
+logger = logging.getLogger(__name__)
 
 class OMLHandler(tornado.web.RequestHandler):
 
diff --git a/oml/item/icons.py b/oml/item/icons.py
index 58fab69..8413121 100644
--- a/oml/item/icons.py
+++ b/oml/item/icons.py
@@ -17,7 +17,7 @@ from utils import resize_image
 import db
 
 import logging
-logger = logging.getLogger('oml.item.icons')
+logger = logging.getLogger(__name__)
 
 
 class Icons(dict):
diff --git a/oml/item/models.py b/oml/item/models.py
index 595d9b3..dc05511 100644
--- a/oml/item/models.py
+++ b/oml/item/models.py
@@ -29,7 +29,7 @@ import state
 import utils
 
 import logging
-logger = logging.getLogger('oml.item.model')
+logger = logging.getLogger(__name__)
 
 user_items = sa.Table('useritem', db.metadata,
     sa.Column('user_id', sa.String(43), sa.ForeignKey('user.id')),
diff --git a/oml/item/person_api.py b/oml/item/person_api.py
index d208b00..9d428e8 100644
--- a/oml/item/person_api.py
+++ b/oml/item/person_api.py
@@ -8,7 +8,7 @@ from .person import Person
 
 
 import logging
-logger = logging.getLogger('oml.item.person_api')
+logger = logging.getLogger(__name__)
 
 
 def parse(data, model):
diff --git a/oml/item/scan.py b/oml/item/scan.py
index 5e5b392..8068a5a 100644
--- a/oml/item/scan.py
+++ b/oml/item/scan.py
@@ -20,7 +20,7 @@ import settings
 import state
 
 import logging
-logger = logging.getLogger('oml.item.scan')
+logger = logging.getLogger(__name__)
 
 extensions = ['epub', 'pdf', 'txt', 'cbr', 'cbz']
 
diff --git a/oml/item/title_api.py b/oml/item/title_api.py
index c38dde8..96ec0f7 100644
--- a/oml/item/title_api.py
+++ b/oml/item/title_api.py
@@ -7,7 +7,7 @@ from . import query
 
 
 import logging
-logger = logging.getLogger('oml.item.title_api')
+logger = logging.getLogger(__name__)
 
 
 def editTitle(data):
diff --git a/oml/localnodes.py b/oml/localnodes.py
index fc5f985..4162e3d 100644
--- a/oml/localnodes.py
+++ b/oml/localnodes.py
@@ -18,7 +18,7 @@ from tor_request import get_opener
 import settings
 
 import logging
-logger = logging.getLogger('oml.localnodes')
+logger = logging.getLogger(__name__)
 
 def can_connect(data):
     try:
@@ -248,6 +248,11 @@ class LocalNodes(object):
         if self._active:
             for id in list(self._nodes.keys()):
                 if not can_connect(self._nodes[id]):
+                    with db.session():
+                        u = user.models.User.get(id)
+                        if u and 'local' in u.info:
+                            del u.info['local']
+                            u.save()
                     del self._nodes[id]
                 if not self._active:
                     break
diff --git a/oml/media/epub.py b/oml/media/epub.py
index 06d8b70..a25b0f5 100644
--- a/oml/media/epub.py
+++ b/oml/media/epub.py
@@ -15,7 +15,7 @@ import stdnum.isbn
 from utils import normalize_isbn, find_isbns
 
 import logging
-logger = logging.getLogger('oml.media.epub')
+logger = logging.getLogger(__name__)
 
 def cover(path):
     logger.debug('cover %s', path)
diff --git a/oml/media/pdf.py b/oml/media/pdf.py
index e1ad951..92eef15 100644
--- a/oml/media/pdf.py
+++ b/oml/media/pdf.py
@@ -16,7 +16,7 @@ import settings
 from utils import normalize_isbn, find_isbns
 
 import logging
-logger = logging.getLogger('oml.meta.pdf')
+logger = logging.getLogger(__name__)
 
 def cover(pdf):
     if sys.platform == 'darwin':
diff --git a/oml/meta/__init__.py b/oml/meta/__init__.py
index f42fa29..3db506d 100644
--- a/oml/meta/__init__.py
+++ b/oml/meta/__init__.py
@@ -14,7 +14,7 @@ from . import google
 from . import duckduckgo
 
 import logging
-logger = logging.getLogger('meta')
+logger = logging.getLogger(__name__)
 
 
 providers = [
diff --git a/oml/meta/abebooks.py b/oml/meta/abebooks.py
index b7054f6..9cdc17e 100644
--- a/oml/meta/abebooks.py
+++ b/oml/meta/abebooks.py
@@ -8,7 +8,7 @@ from ox.cache import read_url
 import lxml.html
 
 import logging
-logger = logging.getLogger('meta.abebooks')
+logger = logging.getLogger(__name__)
 
 base = 'http://www.abebooks.com'
 
diff --git a/oml/meta/duckduckgo.py b/oml/meta/duckduckgo.py
index b560ab6..466175f 100644
--- a/oml/meta/duckduckgo.py
+++ b/oml/meta/duckduckgo.py
@@ -8,7 +8,7 @@ import stdnum.isbn
 from .utils import find_isbns
 
 import logging
-logger = logging.getLogger('meta.duckduckgo')
+logger = logging.getLogger(__name__)
 
 
 def find(query):
diff --git a/oml/meta/google.py b/oml/meta/google.py
index f35ae8d..558be92 100644
--- a/oml/meta/google.py
+++ b/oml/meta/google.py
@@ -8,7 +8,7 @@ import stdnum.isbn
 from .utils import find_isbns
 
 import logging
-logger = logging.getLogger('meta.google')
+logger = logging.getLogger(__name__)
 
 
 def find(query):
diff --git a/oml/meta/loc.py b/oml/meta/loc.py
index 5283e83..9d2a9cc 100644
--- a/oml/meta/loc.py
+++ b/oml/meta/loc.py
@@ -12,7 +12,7 @@ from .marc_countries import COUNTRIES
 from .utils import normalize_isbn
 
 import logging
-logger = logging.getLogger('meta.loc')
+logger = logging.getLogger(__name__)
 
 
 def get_ids(key, value):
diff --git a/oml/meta/lookupbyisbn.py b/oml/meta/lookupbyisbn.py
index 2a38174..8385422 100644
--- a/oml/meta/lookupbyisbn.py
+++ b/oml/meta/lookupbyisbn.py
@@ -11,7 +11,7 @@ import stdnum.isbn
 from .utils import find_isbns
 
 import logging
-logger = logging.getLogger('meta.lookupbyisbn')
+logger = logging.getLogger(__name__)
 
 
 base = 'http://www.lookupbyisbn.com'
diff --git a/oml/meta/openlibrary.py b/oml/meta/openlibrary.py
index 365d183..2c955f5 100644
--- a/oml/meta/openlibrary.py
+++ b/oml/meta/openlibrary.py
@@ -13,7 +13,7 @@ from .marc_countries import COUNTRIES
 from .utils import normalize_isbn
 
 import logging
-logger = logging.getLogger('meta.openlibrary')
+logger = logging.getLogger(__name__)
 
 
 KEYS = {
diff --git a/oml/meta/worldcat.py b/oml/meta/worldcat.py
index 5eafae2..8103eff 100644
--- a/oml/meta/worldcat.py
+++ b/oml/meta/worldcat.py
@@ -12,7 +12,7 @@ import stdnum.isbn
 from .utils import normalize_isbn
 
 import logging
-logger = logging.getLogger('meta.worldcat')
+logger = logging.getLogger(__name__)
 
 
 base_url = 'http://www.worldcat.org'
diff --git a/oml/metaremote.py b/oml/metaremote.py
index 0bd586f..d2a23e0 100644
--- a/oml/metaremote.py
+++ b/oml/metaremote.py
@@ -8,7 +8,7 @@ from urllib.parse import urlencode
 from ox.cache import read_url
 
 import logging
-logger = logging.getLogger('metaremote')
+logger = logging.getLogger(__name__)
 
 def request(action, data):
         data = urlencode({
diff --git a/oml/metaserver.py b/oml/metaserver.py
index 42f0b9f..e937fe2 100644
--- a/oml/metaserver.py
+++ b/oml/metaserver.py
@@ -13,7 +13,7 @@ import meta
 import utils
 
 import logging
-logger = logging.getLogger('metaoml')
+logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
 def findMetadata(data):
diff --git a/oml/node/nodeapi.py b/oml/node/nodeapi.py
index b1ba3f5..af9357e 100644
--- a/oml/node/nodeapi.py
+++ b/oml/node/nodeapi.py
@@ -9,7 +9,7 @@ import settings
 import state
 
 import logging
-logger = logging.getLogger('oml.node.nodeapi')
+logger = logging.getLogger(__name__)
 
 def api_pullChanges(remote_id, user_id=None, from_=None, to=None):
     if user_id and not from_ and not to:
diff --git a/oml/node/server.py b/oml/node/server.py
index 6d00ee3..7975b86 100644
--- a/oml/node/server.py
+++ b/oml/node/server.py
@@ -29,7 +29,7 @@ from . import nodeapi
 from .sslsocket import fileobject
 
 import logging
-logger = logging.getLogger('oml.node.server')
+logger = logging.getLogger(__name__)
 
 
 def get_service_id(key):
diff --git a/oml/nodes.py b/oml/nodes.py
index 489f593..5233515 100644
--- a/oml/nodes.py
+++ b/oml/nodes.py
@@ -29,7 +29,7 @@ import state
 import db
 
 import logging
-logger = logging.getLogger('oml.nodes')
+logger = logging.getLogger(__name__)
 
 ENCODING='base64'
 
diff --git a/oml/oxtornado.py b/oml/oxtornado.py
index 390affa..59be046 100644
--- a/oml/oxtornado.py
+++ b/oml/oxtornado.py
@@ -16,7 +16,7 @@ from threading import Thread
 from functools import wraps
 
 import logging
-logger = logging.getLogger('oxtornado')
+logger = logging.getLogger(__name__)
 
 
 def json_response(data=None, status=200, text='ok'):
diff --git a/oml/queryparser.py b/oml/queryparser.py
index 3dc1f1d..4075b10 100644
--- a/oml/queryparser.py
+++ b/oml/queryparser.py
@@ -9,7 +9,7 @@ import utils
 import settings
 
 import logging
-logger = logging.getLogger('queryparser')
+logger = logging.getLogger(__name__)
 
 def get_operator(op, type='str'):
     return {
diff --git a/oml/server.py b/oml/server.py
index 7a45b7a..9356303 100644
--- a/oml/server.py
+++ b/oml/server.py
@@ -26,7 +26,7 @@ import websocket
 
 import logging
 
-logger = logging.getLogger('oml')
+logger = logging.getLogger(__name__)
 
 class MainHandler(OMLHandler):
 
@@ -51,7 +51,7 @@ def run():
     else:
         logging.basicConfig(level=logging.DEBUG,
             filename=settings.log_path, filemode='w',
-            format='%(asctime)s %(levelname)s %(message)s')
+            format='%(asctime)s - %(levelname)s - %(name)s - %(message)s')
     options = {
         'debug': False,
         'gzip': True
@@ -108,6 +108,9 @@ def run():
             else:
                 with db.session():
                     for u in user.models.User.query.filter_by(peered=True):
+                        if 'local' in u.info:
+                            del u.info['local']
+                            u.save()
                         state.nodes.queue('add', u.id)
                     for u in user.models.User.query.filter_by(queued=True):
                         logger.debug('adding queued node... %s', u.id)
diff --git a/oml/ssl_request.py b/oml/ssl_request.py
index 664b9c7..538ea75 100644
--- a/oml/ssl_request.py
+++ b/oml/ssl_request.py
@@ -9,7 +9,7 @@ import logging
 import base64
 from OpenSSL import crypto
 
-logger = logging.getLogger('oml.ssl_request')
+logger = logging.getLogger(__name__)
 
 def get_service_id(cert):
     # compute sha1 of public key and encode first half in base32
diff --git a/oml/tasks.py b/oml/tasks.py
index 710bd37..fa1bb0a 100644
--- a/oml/tasks.py
+++ b/oml/tasks.py
@@ -9,7 +9,7 @@ from websocket import trigger_event
 
 
 import logging
-logger = logging.getLogger('oml.tasks')
+logger = logging.getLogger(__name__)
 
 class Tasks(Thread):
 
diff --git a/oml/tor.py b/oml/tor.py
index a3bdb89..d98c2fc 100644
--- a/oml/tor.py
+++ b/oml/tor.py
@@ -7,11 +7,10 @@ import stem
 from stem.control import Controller
 import settings
 
-import logging
 import state
-import time
 
-logger = logging.getLogger('oml.tor')
+import logging
+logger = logging.getLogger(__name__)
 
 class TorDaemon(Thread):
     def __init__(self):
@@ -75,6 +74,7 @@ DirReqStatistics 0
             self.p = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1, universal_newlines=True)
             for line in self.p.stdout:
                 self._status.append(line)
+                logger.debug(line)
             self.p = None
 
     def shutdown(self):
diff --git a/oml/tor_request.py b/oml/tor_request.py
index d3186a7..b26e848 100644
--- a/oml/tor_request.py
+++ b/oml/tor_request.py
@@ -13,7 +13,7 @@ import settings
 import state
 from utils import get_service_id, get_local_ipv4
 
-logger = logging.getLogger('oml.tor_request')
+logger = logging.getLogger(__name__)
 
 class InvalidCertificateException(http.client.HTTPException, urllib.error.URLError):
     def __init__(self, service_id, cert, reason):
diff --git a/oml/user/api.py b/oml/user/api.py
index 752cd35..9049d77 100644
--- a/oml/user/api.py
+++ b/oml/user/api.py
@@ -16,7 +16,7 @@ import settings
 import state
 
 import logging
-logger = logging.getLogger('oml.user.api')
+logger = logging.getLogger(__name__)
 
 
 def init(data):
diff --git a/oml/user/models.py b/oml/user/models.py
index becd841..222297b 100644
--- a/oml/user/models.py
+++ b/oml/user/models.py
@@ -14,7 +14,7 @@ import settings
 import state
 
 import logging
-logger = logging.getLogger('oml.user.models')
+logger = logging.getLogger(__name__)
 
 class User(db.Model):
     __tablename__ = 'user'
diff --git a/oml/utils.py b/oml/utils.py
index 521929b..afca30c 100644
--- a/oml/utils.py
+++ b/oml/utils.py
@@ -32,7 +32,7 @@ from Crypto.Util.asn1 import DerSequence
 from meta.utils import normalize_isbn, find_isbns
 
 import logging
-logger = logging.getLogger('oml.utils')
+logger = logging.getLogger(__name__)
 
 ENCODING='base64'
 
diff --git a/oml/websocket.py b/oml/websocket.py
index 58ecd06..3c8825f 100644
--- a/oml/websocket.py
+++ b/oml/websocket.py
@@ -11,7 +11,7 @@ from oxtornado import json_dumps
 import state
 
 import logging
-logger = logging.getLogger('oml.websocket')
+logger = logging.getLogger(__name__)
 
 
 class Handler(WebSocketHandler):