Merge pull request #59 from waartaa/logging

Implement logging, unified import layout

ircb/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

ircb/bouncer.py

@@ -1,14 +1,16 @@
+# -*- coding: utf-8 -*-
 import asyncio
-from collections import defaultdict
 import logging
-import logging.config
-from ircb.connection import Connection
+
+from collections import defaultdict
+
 import ircb.stores
+
 from ircb.config import settings
-from ircb.storeclient import (NetworkStore, ClientStore, ChannelStore,
-                              UserStore, initialize as storeclient_initialize)
+from ircb.connection import Connection
 from ircb.irc import IrcbBot
-
+from ircb.storeclient import initialize as storeclient_initialize
+from ircb.storeclient import ChannelStore, ClientStore, NetworkStore, UserStore
 
 logger = logging.getLogger('bouncer')
 
@@ -250,7 +252,6 @@ def unregister_client(self, network_id, client):
 
 
 def runserver(host='0.0.0.0', port=9000, mode='allinone'):
-    logging.config.dictConfig(settings.LOGGING_CONF)
     if mode == 'allinone':
         ircb.stores.initialize()
     storeclient_initialize()

ircb/cli/loaddata.py

@@ -3,8 +3,7 @@
 import yaml
 
 from ircb.lib.async import coroutinize
-from ircb.storeclient import UserStore
-from ircb.storeclient import NetworkStore
+from ircb.storeclient import NetworkStore, UserStore
 
 
 @click.group(name='users')
@@ -13,7 +12,7 @@ def loaddata_cli():
     pass
 
 
-def validate_yaml(f): 
+def validate_yaml(f):
     "Validates YAML file"
     return True
 
@@ -25,7 +24,7 @@ def load_data(f):
     with open(f, 'r') as f:
         config = yaml.load(f)
 
-        if validate_yaml(config): 
+        if validate_yaml(config):
 
             for user in config.keys():
                 user_data = config[user]

ircb/cli/main.py

@@ -1,15 +1,15 @@
 import click
 
-from ircb.cli.user import user_cli
+from ircb.cli.loaddata import load_data
 from ircb.cli.network import network_cli
 from ircb.cli.run import run_cli
-from ircb.cli.loaddata import load_data
-
+from ircb.cli.user import user_cli
+from ircb.utils.config import load_config
 
 @click.group()
 def cli():
     """ircb CLI"""
-    pass
+    load_config()
 
 
 cli.add_command(user_cli)

ircb/cli/network.py

@@ -3,8 +3,8 @@
 
 from tabulate import tabulate
 
-from ircb.storeclient import NetworkStore
 from ircb.lib.async import coroutinize
+from ircb.storeclient import NetworkStore
 
 
 @click.group(name='networks')

ircb/cli/run.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 import click
-import logging
-import logging.config
-from ircb.config import settings
+
 from ircb.bouncer import runserver
+from ircb.config import settings
 
 
 @click.group(name='run')
@@ -27,7 +26,6 @@ def run_server(host, port, mode):
 
 @click.command(name='stores')
 def run_stores():
-    logging.config.dictConfig(settings.LOGGING_CONF)
     import ircb.stores
     import ircb.stores.base
     ircb.stores.initialize()

ircb/config/__init__.py

@@ -1,5 +1,8 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
+
 import os
+
 from . import default_settings
 
 

ircb/config/default_settings.py

@@ -23,6 +23,11 @@
         }
     ),
     loggers=dict(
+        ircb={
+            "level": "DEBUG",
+            "propagate": False,
+            "handlers": ["console"],
+        },
         network={
             "level": "DEBUG",
             "propagate": False,
@@ -47,6 +52,11 @@
             "level": "DEBUG",
             "propagate": False,
             "handlers": ["console"],
+        },
+        aiohttp={
+            "level": "DEBUG",
+            "propagate": False,
+            "handlers": ["console"],
         }
     ),
 )

ircb/connection.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import asyncio
 
 

ircb/forms/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from .network import NetworkForm
 
 __all__ = [

ircb/forms/network.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from wtforms_alchemy import ModelForm
 from wtforms.fields import SelectField
 

ircb/forms/user.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from wtforms_alchemy import ModelForm
 
 from ircb.models import User

ircb/irc/plugins/autojoins.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 import irc3
 from irc3.plugins.autojoins import AutoJoins as Irc3AutoJoins
 

ircb/irc/plugins/ircb.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import asyncio
 import irc3
 

ircb/lib/async.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import asyncio
 
 

ircb/lib/dispatcher/__init__.py

@@ -1,9 +1,11 @@
+# -*- coding: utf-8 -*-
 import asyncio
 import aiozmq.rpc
 import aioredis
-from collections import defaultdict
 import logging
 
+from collections import defaultdict
+
 from ircb.config import settings
 
 logger = logging.getLogger('dispatcher')

ircb/models/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from .network import Network
 from .user import User
 from .channel import Channel

ircb/models/channel.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-
 import datetime
 
-from sqlalchemy import (Column, String, Integer, ForeignKey, DateTime,
-                        UniqueConstraint)
+from sqlalchemy import Column, String, Integer, ForeignKey, DateTime
+from sqlalchemy import UniqueConstraint
 from sqlalchemy_utils import ChoiceType
 
 from ircb.config import settings

ircb/models/client.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-
 import datetime
-from sqlalchemy import (Column, String, Integer, ForeignKey, DateTime,
-                        UniqueConstraint)
+
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String
+from sqlalchemy import UniqueConstraint
 
 from ircb.models.lib import Base
 

ircb/models/lib.py

@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import scoped_session
+
 from ircb.config import settings
 
 

ircb/models/network.py

@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
-
 import datetime
+
 from hashlib import md5
 
 import sqlalchemy as sa
+
 from sqlalchemy_utils import ChoiceType, Choice
 
 from ircb.models.lib import Base, get_session

ircb/models/user.py

@@ -1,9 +1,11 @@
 import datetime
+
 from flask_user import UserMixin
-from sqlalchemy import (Column, String, Unicode, Boolean, ForeignKey, Integer,
-                        DateTime)
+from sqlalchemy import Column, String, Unicode, Boolean, ForeignKey, Integer
+from sqlalchemy import DateTime
 from sqlalchemy.orm import relationship, backref
 from sqlalchemy_utils import PasswordType
+
 from ircb.models.lib import Base
 
 

ircb/storeclient/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
 from .network import NetworkStore

ircb/storeclient/base.py

@@ -1,4 +1,6 @@
+# -*- coding: utf-8 -*-
 import asyncio
+
 from uuid import uuid1
 
 from ircb.lib.dispatcher import Dispatcher

ircb/storeclient/client.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from ircb.models import Client
 from ircb.storeclient.base import BaseStore
 from ircb.lib.constants.signals import (STORE_CLIENT_CREATE,

ircb/storeclient/network.py

@@ -1,9 +1,12 @@
+# -*- coding: utf-8 -*-
 from ircb.models import Network
 from ircb.storeclient.base import BaseStore
-from ircb.lib.constants.signals import (
-    STORE_NETWORK_CREATE, STORE_NETWORK_CREATED,
-    STORE_NETWORK_GET, STORE_NETWORK_GOT,
-    STORE_NETWORK_UPDATE, STORE_NETWORK_UPDATED)
+from ircb.lib.constants.signals import (STORE_NETWORK_CREATE,
+                                        STORE_NETWORK_CREATED,
+                                        STORE_NETWORK_GET,
+                                        STORE_NETWORK_GOT,
+                                        STORE_NETWORK_UPDATE,
+                                        STORE_NETWORK_UPDATED)
 
 
 class NetworkStore(BaseStore):

ircb/storeclient/user.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 from ircb.models import User
 from ircb.storeclient.base import BaseStore
-from ircb.lib.constants.signals import (
-    STORE_USER_CREATE, STORE_USER_CREATED,
-    STORE_USER_GET, STORE_USER_GOT)
+from ircb.lib.constants.signals import (STORE_USER_CREATE,
+                                        STORE_USER_CREATED,
+                                        STORE_USER_GET,
+                                        STORE_USER_GOT)
 
 
 class UserStore(BaseStore):

ircb/stores/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 
 from ircb.models import create_tables

ircb/stores/base.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
+import logging
+
 from ircb.lib.dispatcher import Dispatcher
 from ircb.models.lib import Base
 
-import logging
-
 logger = logging.getLogger('stores')
 
 

ircb/stores/client.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 from ircb.models import Client, Network, get_session
 from ircb.lib.constants.signals import (STORE_CLIENT_CREATE,
                                         STORE_CLIENT_CREATED,

ircb/stores/network.py

@@ -1,7 +1,10 @@
-from ircb.lib.constants.signals import (
-    STORE_NETWORK_CREATE, STORE_NETWORK_CREATED,
-    STORE_NETWORK_UPDATE, STORE_NETWORK_UPDATED,
-    STORE_NETWORK_GET, STORE_NETWORK_GOT)
+# -*- coding: utf-8 -*-
+from ircb.lib.constants.signals import (STORE_NETWORK_CREATE,
+                                        STORE_NETWORK_CREATED,
+                                        STORE_NETWORK_UPDATE,
+                                        STORE_NETWORK_UPDATED,
+                                        STORE_NETWORK_GET,
+                                        STORE_NETWORK_GOT)
 from ircb.models import get_session, User, Network
 from ircb.stores.base import BaseStore
 

ircb/stores/user.py

@@ -1,6 +1,8 @@
-from ircb.lib.constants.signals import (
-    STORE_USER_CREATE, STORE_USER_CREATED,
-    STORE_USER_GET, STORE_USER_GOT)
+# -*- coding: utf-8 -*-
+from ircb.lib.constants.signals import (STORE_USER_CREATE,
+                                        STORE_USER_CREATED,
+                                        STORE_USER_GET,
+                                        STORE_USER_GOT)
 from ircb.models import get_session, User
 from ircb.stores.base import BaseStore
 

ircb/utils/config.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+import logging.config
+
+from ircb.config import settings
+
+def load_config():
+    logging.config.dictConfig(settings.LOGGING_CONF)