Merge lp:~robru/friends/persistence into lp:friends

[Robert Bruce Park]

This implements the Dee.ResourceManager for persisting our Dee.SharedModel across instances of friends-service.

So, the important thing is that this *works*. I confirmed it with debug_live.py script. You can run './tools/debug_live.py twitter home' and then run './tools/debug_live.py facebook receive' and you'll see the second invocation will still show you all the rows from the first invocation (eg, the twitter messages will show up with the facebook ones as well).

That said, I don't know what kind of performance implications this has. Probably this is going to make friends-service very slow to launch once there are lots of rows in the Model. We should consider some kind of row-expiry logic, dropping rows after they are older than some certain threshold. Or maybe just putting a hard limit on the number of rows that we'll allow and then deleting the oldest of the rows when that limit is exceeded. Somebody who knows more about Dee should decide what the maximum number of rows should be before we can expect performance to become an issue.

barry: I don't know how to write a test for this. Maybe TestDbus could be expanded to invoke friends-service, close it, invoke it again, and test that Model rows are still there? I don't know what that would look like.

kenvandine: when you ping mhr3 about this, please show him this mp so he can see what we're trying to do.

[lp:~robru/friends/persistence]

8. By Robert Bruce Park on 2012-10-18

Add test case for _initialize_caches, and some cleanup.

9. By Robert Bruce Park on 2012-10-18

Stop persisting an unchanged model at launch.

Previously the code was unconditionally saving the Model to disk
immediately after loading it, even if there were no changes.

Now, we will save an empty model to disk at launch only if a) there
was no model saved before, or b) the schema has changed since the last
run, invalidating all existing data.

10. By Robert Bruce Park on 2012-10-18

Add a test case for persist_model function.

[Robert Bruce Park (robru)]

Alright, this is tested and working. Please merge ;-)

review: Approve

[lp:~robru/friends/persistence]

11. By Robert Bruce Park on 2012-10-20

Merged trunk.

12. By Robert Bruce Park on 2012-10-20

Add row expiry logic.

13. By Robert Bruce Park on 2012-10-20

Add test coverage for model pruning functionality.

14. By Robert Bruce Park on 2012-10-20

Move prune_model and initialize_caches calls into main.py

The reason for this is that a) defining a function only to call it
immediately is slightly goofy, and b) this gives main.py finer-grained
control on startup tasks, freeing us from import side-effects that
could potentially break if we had the wrong import order.

15. By Robert Bruce Park on 2012-10-22

Use Model.insert_sorted instead of Model.append, sorting by timestamp.

This makes it easier to delete oldest rows when pruning.

16. By Robert Bruce Park on 2012-10-22

Merged lp:friends

17. By Robert Bruce Park on 2012-10-23

Fix SharedModel sorting, thanks to mhr3.

Apparently you can't cmp() a GLib.Variant the way you would expect to
do so with a string, so you have to .get_string() from the Variant
first.

This commit also adds tests for _cmp and _cmp_date, and also fixes up
a bunch of other tests which were broken by the model data being sorted.

18. By Robert Bruce Park on 2012-10-23

Pyflakes cleanup.

19. By Robert Bruce Park on 2012-10-23

Prevent Dispatcher.Refresh from pointlessly saving the Model at launch.

20. By Robert Bruce Park on 2012-10-23

Merged lp:friends.

=== modified file 'friends/main.py'
--- friends/main.py	2012-10-19 21:09:10 +0000
+++ friends/main.py	2012-10-23 17:34:18 +0000
@@ -33,8 +33,10 @@
 from friends.service.connection import ConnectionMonitor
 from friends.service.dispatcher import Dispatcher
 from friends.service.shortener import URLShorten
+from friends.utils.base import initialize_caches
 from friends.utils.logging import initialize
 from friends.utils.menus import MenuManager
+from friends.utils.model import prune_model
 from friends.utils.options import Options
 
 
@@ -61,6 +63,20 @@
     log = logging.getLogger(__name__)
     log.info('Friends backend service starting')
 
+    # mhr3 says that we should not let a Dee.SharedModel exceed 8mb in
+    # size, because anything larger will have problems being transmitted
+    # over DBus. I have conservatively calculated our average row length
+    # to be 500 bytes, which means that we shouldn't let our model exceed
+    # approximately 16,000 rows. However, that seems like a lot to me, so
+    # I'm going to set it to 8,000 for now and we can tweak this later if
+    # necessary. Do you really need more than 8,000 tweets in memory at
+    # once? What are you doing with all these tweets?
+    prune_model(8000)
+
+    # This builds two different indexes of our persisted Dee.Model
+    # data for the purposes of faster duplicate checks.
+    initialize_caches()
+
     # Set up the DBus main loop.
     DBusGMainLoop(set_as_default=True)
     loop = GLib.MainLoop()

=== modified file 'friends/service/dispatcher.py'
--- friends/service/dispatcher.py	2012-10-23 04:27:58 +0000
+++ friends/service/dispatcher.py	2012-10-23 17:34:18 +0000
@@ -33,6 +33,7 @@
 from friends.utils.avatar import Avatar
 from friends.utils.manager import protocol_manager
 from friends.utils.signaler import signaler
+from friends.utils.model import persist_model
 
 log = logging.getLogger(__name__)
 
@@ -54,7 +55,10 @@
         signaler.add_signal('ConnectionOnline', self._on_connection_online)
         signaler.add_signal('ConnectionOffline', self._on_connection_offline)
         self._on_connection_online()
+        # Don't persist the model on launch, before we have anything to save.
+        self._do_persist_model = False
         self.Refresh()
+        self._do_persist_model = True
 
     def _on_connection_online(self):
         if self._timer_id is None:
@@ -80,6 +84,12 @@
             if thread != current:
                 thread.join()
 
+        # Write the Dee.SharedModel to disk. We do this every refresh
+        # for robustness, so if the computer loses power, we won't
+        # lose all the messages.
+        if self._do_persist_model:
+            persist_model()
+
         if not self.online:
             return
 

=== modified file 'friends/tests/test_download.py'
--- friends/tests/test_download.py	2012-10-19 19:27:21 +0000
+++ friends/tests/test_download.py	2012-10-23 17:34:18 +0000
@@ -27,7 +27,7 @@
 import threading
 
 from base64 import encodebytes
-from urllib.error import HTTPError, URLError
+from urllib.error import URLError
 from urllib.parse import parse_qs
 from urllib.request import urlopen
 from wsgiref.simple_server import WSGIRequestHandler, make_server

=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2012-10-20 15:35:30 +0000
+++ friends/tests/test_flickr.py	2012-10-23 17:34:18 +0000
@@ -262,7 +262,7 @@
         self.assertEqual(col('sender'), '123')
         self.assertEqual(col('timestamp'), '2012-05-10T13:36:45')
         self.assertFalse(col('from_me'))
-        row = list(TestModel.get_row(1))
+        row = list(TestModel.get_row(2))
         # Image 2 data.  The image is from the account owner.
         self.assertEqual(col('message'), 'bee')
         self.assertEqual(col('html'), 'bee')
@@ -272,7 +272,7 @@
         self.assertTrue(col('from_me'))
         # Image 3 data.  This data set has some additional entries that allow
         # various image urls and other keys to be added.
-        row = list(TestModel.get_row(2))
+        row = list(TestModel.get_row(1))
         self.assertEqual(col('message'), 'cat')
         self.assertEqual(col('html'), 'cat')
         self.assertEqual(

=== modified file 'friends/tests/test_model.py'
--- friends/tests/test_model.py	2012-10-13 01:27:15 +0000
+++ friends/tests/test_model.py	2012-10-23 17:34:18 +0000
@@ -26,19 +26,85 @@
 
 import unittest
 
-from friends.utils.model import Model
+from friends.utils.model import Model, first_run, stale_schema
+from friends.utils.model import prune_model, persist_model
+from friends.testing.mocks import LogMock
 from gi.repository import Dee
 
 
+try:
+    # Python 3.3
+    from unittest import mock
+except ImportError:
+    import mock
+
+
 class TestModel(unittest.TestCase):
     """Test our Dee.SharedModel instance."""
 
+    def setUp(self):
+        self.log_mock = LogMock('friends.utils.model')
+
+    def tearDown(self):
+        self.log_mock.stop()
+
     def test_basic_properties(self):
         self.assertIsInstance(Model, Dee.SharedModel)
         self.assertEqual(Model.get_n_columns(), 37)
-        self.assertEqual(Model.get_n_rows(), 0)
         self.assertEqual(Model.get_schema(),
                          ['aas', 's', 's', 's', 'b', 's', 's', 's',
                           's', 's', 's', 's', 's', 's', 'd', 'b', 's', 's',
                           's', 's', 's', 's', 's', 's', 's', 's', 's', 's',
                           's', 's', 's', 's', 's', 'as', 's', 's', 's'])
+        if first_run or stale_schema:
+            # Then the Model should be brand-new and empty
+            self.assertEqual(Model.get_n_rows(), 0)
+
+    @mock.patch('friends.utils.model._resource_manager')
+    def test_persistence(self, resource_manager):
+        persist_model()
+        resource_manager.store.assert_called_once_with(
+            Model, 'com.canonical.Friends.Streams')
+
+    @mock.patch('friends.utils.model.Model')
+    @mock.patch('friends.utils.model.persist_model')
+    def test_prune_one(self, persist, model):
+        model.get_n_rows.return_value = 8001
+        def side_effect(arg):
+            model.get_n_rows.return_value -= 1
+        model.remove.side_effect = side_effect
+        prune_model(8000)
+        persist.assert_called_once_with()
+        model.get_first_iter.assert_called_once_with()
+        model.remove.assert_called_once_with(model.get_first_iter())
+        self.assertEqual(self.log_mock.empty(),
+                         'Deleted 1 rows from Dee.SharedModel.\n')
+
+    @mock.patch('friends.utils.model.Model')
+    @mock.patch('friends.utils.model.persist_model')
+    def test_prune_one_hundred(self, persist, model):
+        model.get_n_rows.return_value = 8100
+        def side_effect(arg):
+            model.get_n_rows.return_value -= 1
+        model.remove.side_effect = side_effect
+        prune_model(8000)
+        persist.assert_called_once_with()
+        self.assertEqual(model.get_first_iter.call_count, 100)
+        model.remove.assert_called_with(model.get_first_iter())
+        self.assertEqual(model.remove.call_count, 100)
+        self.assertEqual(self.log_mock.empty(),
+                         'Deleted 100 rows from Dee.SharedModel.\n')
+
+    @mock.patch('friends.utils.model.Model')
+    @mock.patch('friends.utils.model.persist_model')
+    def test_prune_none(self, persist, model):
+        model.get_n_rows.return_value = 100
+        def side_effect(arg):
+            model.get_n_rows.return_value -= 1
+        model.remove.side_effect = side_effect
+        prune_model(8000)
+        model.get_n_rows.assert_called_once_with()
+        self.assertFalse(persist.called)
+        self.assertFalse(model.get_first_iter.called)
+        self.assertFalse(model.remove.called)
+        self.assertEqual(self.log_mock.empty(), '')

=== modified file 'friends/tests/test_protocols.py'
--- friends/tests/test_protocols.py	2012-10-13 01:27:15 +0000
+++ friends/tests/test_protocols.py	2012-10-23 17:34:18 +0000
@@ -29,7 +29,7 @@
 from friends.protocols.flickr import Flickr
 from friends.protocols.twitter import Twitter
 from friends.testing.helpers import FakeAccount
-from friends.utils.base import Base, feature
+from friends.utils.base import Base, feature, _cmp, _cmp_date, TIME_IDX
 from friends.utils.manager import ProtocolManager
 from friends.utils.model import (
     COLUMN_INDICES, COLUMN_NAMES, COLUMN_TYPES, Model)
@@ -146,16 +146,40 @@
 
     @mock.patch('friends.utils.base.Model', TestModel)
     def test_shared_model_successfully_mocked(self):
-        self.assertEqual(Model.get_n_rows(), 0)
+        count = Model.get_n_rows()
         self.assertEqual(TestModel.get_n_rows(), 0)
         base = Base(FakeAccount())
         base._publish('alpha', message='a')
         base._publish('beta', message='b')
         base._publish('omega', message='c')
-        self.assertEqual(Model.get_n_rows(), 0)
+        self.assertEqual(Model.get_n_rows(), count)
         self.assertEqual(TestModel.get_n_rows(), 3)
 
     @mock.patch('friends.utils.base.Model', TestModel)
+    @mock.patch('friends.utils.base._seen_ids', {})
+    @mock.patch('friends.utils.base._seen_messages', {})
+    def test_seen_dicts_successfully_instantiated(self):
+        from friends.utils.base import _seen_ids, _seen_messages
+        from friends.utils.base import initialize_caches
+        self.assertEqual(TestModel.get_n_rows(), 0)
+        base = Base(FakeAccount())
+        base._publish('alpha', sender='a', message='a')
+        base._publish('beta', sender='a', message='a')
+        base._publish('omega', sender='a', message='b')
+        self.assertEqual(TestModel.get_n_rows(), 2)
+        _seen_ids.clear()
+        _seen_messages.clear()
+        initialize_caches()
+        self.assertEqual(sorted(list(_seen_messages.keys())), ['aa', 'ab'])
+        self.assertEqual(sorted(list(_seen_ids.keys())),
+                         [('base', 'faker/than fake', 'alpha'),
+                          ('base', 'faker/than fake', 'beta'),
+                          ('base', 'faker/than fake', 'omega')])
+        # These two point at the same row because sender+message are identical
+        self.assertEqual(_seen_ids[('base', 'faker/than fake', 'alpha')],
+                         _seen_ids[('base', 'faker/than fake', 'beta')])
+
+    @mock.patch('friends.utils.base.Model', TestModel)
     def test_invalid_argument(self):
         base = Base(FakeAccount())
         self.assertEqual(0, TestModel.get_n_rows())
@@ -342,10 +366,10 @@
         # See?  Two rows in the table.
         self.assertEqual(2, TestModel.get_n_rows())
         # The first row is the message from fred.
-        self.assertEqual(TestModel.get_row(0)[COLUMN_INDICES['sender']],
+        self.assertEqual(TestModel.get_row(1)[COLUMN_INDICES['sender']],
                          'fred')
         # The second row is the message from tedtholomew.
-        self.assertEqual(TestModel.get_row(1)[COLUMN_INDICES['sender']],
+        self.assertEqual(TestModel.get_row(0)[COLUMN_INDICES['sender']],
                          'tedtholomew')
 
     def test_basic_login(self):
@@ -370,3 +394,27 @@
 
     def test_features(self):
         self.assertEqual(MyProtocol.get_features(), ['feature_1', 'feature_2'])
+
+    def test_cmp(self):
+        self.assertEqual(_cmp('2007-05-15T16:45:00', '2007-05-15T16:45:01'), -1)
+        self.assertEqual(_cmp('2007-05-15T16:45:00', '2007-05-15T16:45:00'), 0)
+        self.assertEqual(_cmp('2007-05-15T16:45:01', '2007-05-15T16:45:00'), 1)
+
+    def test_cmp_date(self):
+        """Ensure that our SharedModel sorting func sorts correctly."""
+        row1 = ['foo'] * 100
+        row2 = ['bar'] * 100
+        class fake_variant:
+            def __init__(self, string):
+                self.string = string
+            def get_string(self):
+                return self.string
+        row1[TIME_IDX] = fake_variant('2012-01-01T11:59:59')
+        row2[TIME_IDX] = fake_variant('2012-01-01T11:59:59')
+        self.assertEqual(_cmp_date(row1, len(row1), row2, len(row2), None), 0)
+        row1[TIME_IDX] = fake_variant('2012-01-01T11:59:58')
+        row2[TIME_IDX] = fake_variant('2012-01-01T11:59:59')
+        self.assertEqual(_cmp_date(row1, len(row1), row2, len(row2), None), -1)
+        row1[TIME_IDX] = fake_variant('2012-01-01T11:59:58')
+        row2[TIME_IDX] = fake_variant('2012-01-01T11:59:57')
+        self.assertEqual(_cmp_date(row1, len(row1), row2, len(row2), None), 1)

=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2012-10-16 18:31:06 +0000
+++ friends/tests/test_twitter.py	2012-10-23 17:34:18 +0000
@@ -126,11 +126,12 @@
 
         # This test data was ripped directly from Twitter's API docs.
         expected = [
-            [[['twitter', 'faker/than fake', '240558470661799936']],
-             'messages', 'OAuth Dancer', 'oauth_dancer', False,
-             '2012-08-28T21:16:23', 'just another test', '',
-             'https://si0.twimg.com/profile_images/730275945/oauth-dancer_normal.jpg',
-             'https://twitter.com/oauth_dancer/status/240558470661799936', '',
+            [[['twitter', 'faker/than fake', '240539141056638977']],
+             'messages', 'Taylor Singletary', 'episod', False,
+             '2012-08-28T19:59:34',
+             'You\'d be right more often if you thought you were wrong.', '',
+             'https://si0.twimg.com/profile_images/2546730059/f6a8zq58mg1hn0ha8vie_normal.jpeg',
+             'https://twitter.com/episod/status/240539141056638977', '',
              '', '', '', 0.0, False, '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', [], '', '', '',
              ],
@@ -144,12 +145,11 @@
              '', '', '', 0.0, False, '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', [], '', '', '',
              ],
-            [[['twitter', 'faker/than fake', '240539141056638977']],
-             'messages', 'Taylor Singletary', 'episod', False,
-             '2012-08-28T19:59:34',
-             'You\'d be right more often if you thought you were wrong.', '',
-             'https://si0.twimg.com/profile_images/2546730059/f6a8zq58mg1hn0ha8vie_normal.jpeg',
-             'https://twitter.com/episod/status/240539141056638977', '',
+            [[['twitter', 'faker/than fake', '240558470661799936']],
+             'messages', 'OAuth Dancer', 'oauth_dancer', False,
+             '2012-08-28T21:16:23', 'just another test', '',
+             'https://si0.twimg.com/profile_images/730275945/oauth-dancer_normal.jpg',
+             'https://twitter.com/oauth_dancer/status/240558470661799936', '',
              '', '', '', 0.0, False, '', '', '', '', '', '', '', '', '', '',
              '', '', '', '', '', '', '', [], '', '', '',
              ],

=== modified file 'friends/utils/base.py'
--- friends/utils/base.py	2012-10-19 21:09:10 +0000
+++ friends/utils/base.py	2012-10-23 17:34:18 +0000
@@ -19,6 +19,7 @@
 __all__ = [
     'Base',
     'feature',
+    'initialize_caches',
     ]
 
 
@@ -27,8 +28,11 @@
 import logging
 import threading
 
+from datetime import datetime
+
 from friends.utils.authentication import Authentication
 from friends.utils.model import COLUMN_INDICES, SCHEMA, DEFAULTS, Model
+from friends.utils.time import ISO8601_FORMAT
 
 
 IGNORED = string.punctuation + string.whitespace
@@ -38,6 +42,7 @@
 SENDER_IDX = COLUMN_INDICES['sender']
 MESSAGE_IDX = COLUMN_INDICES['message']
 IDS_IDX = COLUMN_INDICES['message_ids']
+TIME_IDX = COLUMN_INDICES['timestamp']
 
 
 # This is a mapping from Dee.SharedModel row keys to the DeeModelIters
@@ -66,7 +71,7 @@
 
     Then find all feature methods for a protocol with:
 
-    for feature_name in ProtocolClass.features:
+    for feature_name in ProtocolClass.get_features():
         # ...
     """
     method.is_feature = True
@@ -102,6 +107,35 @@
     return EMPTY_STRING.join(char for char in key if char not in IGNORED)
 
 
+def _cmp(a, b):
+    """Ressurrect cmp() because Dee.SharedModel demands it."""
+    return (a > b) - (a < b)
+
+
+def _cmp_date(row1, row1_length, row2, row2_length, user_data):
+    """Comparison function that sorts Model rows by UTC timestamp."""
+    row1_key = row1[TIME_IDX].get_string()
+    row2_key = row2[TIME_IDX].get_string()
+    return _cmp(row1_key, row2_key)
+
+
+def initialize_caches():
+    """Populate _seen_ids and _seen_messages with Model data.
+
+    Our Dee.SharedModel persists across instances, so we need to
+    populate these caches at launch.
+    """
+    for i in range(Model.get_n_rows()):
+        row_iter = Model.get_iter_at_row(i)
+        row = Model.get_row(row_iter)
+        _seen_messages[_make_key(row)] = row_iter
+        for triple in row[IDS_IDX]:
+            _seen_ids[tuple(triple)] = row_iter
+    log.debug(
+        '_seen_ids: {}, _seen_messages: {}'.format(
+            len(_seen_ids), len(_seen_messages)))
+
+
 class _OperationThread(threading.Thread):
     """Catch, log, and swallow all exceptions in the sub-thread."""
 
@@ -207,6 +241,11 @@
         if len(kwargs) > 0:
             raise TypeError('Unexpected keyword arguments: {}'.format(
                 COMMA_SPACE.join(sorted(kwargs))))
+        if not args[TIME_IDX]:
+            # We *need* a timestamp for sorting so badly that it's better
+            # to use the current time than to fail too loudly.
+            log.error('No timestamp for message: {!r}'.format(triple))
+            args[TIME_IDX] = datetime.today().strftime(ISO8601_FORMAT)
         with _publish_lock:
             # Don't let duplicate messages into the model, but do record the
             # unique message ids of each duplicate message.
@@ -214,7 +253,7 @@
             row_iter = _seen_messages.get(key)
             if row_iter is None:
                 # We haven't seen this message before.
-                _seen_messages[key] = Model.append(*args)
+                _seen_messages[key] = Model.insert_sorted(_cmp_date, *args)
             else:
                 # We have seen this before, so append to the matching column's
                 # message_ids list, this message's id.

=== modified file 'friends/utils/download.py'
--- friends/utils/download.py	2012-10-19 19:10:54 +0000
+++ friends/utils/download.py	2012-10-23 17:34:18 +0000
@@ -28,7 +28,6 @@
 from base64 import encodebytes
 from contextlib import contextmanager
 from gi.repository import Soup, SoupGNOME
-from urllib.error import HTTPError
 from urllib.parse import urlencode
 
 log = logging.getLogger(__name__)

=== modified file 'friends/utils/model.py'
--- friends/utils/model.py	2012-10-13 01:27:15 +0000
+++ friends/utils/model.py	2012-10-23 17:34:18 +0000
@@ -29,11 +29,17 @@
     'COLUMN_TYPES',
     'COLUMN_INDICES',
     'DEFAULTS',
+    'MODEL_DBUS_NAME',
+    'persist_model',
+    'prune_model',
     ]
 
 
 from gi.repository import Dee
 
+import logging
+log = logging.getLogger(__name__)
+
 
 # Most of this schema is very straightforward, but the 'message_ids' column
 # needs a bit of explanation:
@@ -108,5 +114,45 @@
     }
 
 
-Model = Dee.SharedModel.new('com.canonical.Friends.Streams')
-Model.set_schema_full(COLUMN_TYPES)
+MODEL_DBUS_NAME = 'com.canonical.Friends.Streams'
+_resource_manager = Dee.ResourceManager.get_default()
+Model = _resource_manager.load(MODEL_DBUS_NAME)
+
+
+first_run = Model is None
+if not first_run:
+    stale_schema = Model.get_schema() != list(COLUMN_TYPES)
+else:
+    stale_schema = True
+
+
+def persist_model():
+    """Write our Dee.SharedModel instance to disk."""
+    log.debug('Saving Dee.SharedModel with {} rows.'.format(len(Model)))
+    _resource_manager.store(Model, MODEL_DBUS_NAME)
+
+
+# If this is first run, or the schema has changed since last run,
+# we'll need to make a new, empty Model.
+if first_run or stale_schema:
+    log.debug('Starting a new, empty Dee.SharedModel.')
+    Model = Dee.SharedModel.new(MODEL_DBUS_NAME)
+    Model.set_schema_full(COLUMN_TYPES)
+
+    # Calling this from here ensures that schema changes are persisted
+    # ASAP, but we also call it periodically in the dispatcher in
+    # order to ensure data is saved often in case of power loss.
+    persist_model()
+
+
+def prune_model(maximum):
+    """If there are more than maximum rows, remove the oldest ones."""
+    pruned = 0
+    while Model.get_n_rows() > maximum:
+        Model.remove(Model.get_first_iter())
+        pruned += 1
+
+    if pruned:
+        log.debug('Deleted {} rows from Dee.SharedModel.'.format(pruned))
+        # Delete those messages from disk, too, not just memory.
+        persist_model()

=== modified file 'tools/debug_live.py'
--- tools/debug_live.py	2012-10-20 00:32:54 +0000
+++ tools/debug_live.py	2012-10-23 17:34:18 +0000
@@ -20,20 +20,19 @@
 """
 
 import sys
-import time
 import logging
 
 sys.path.insert(0, '.')
 
 from gi.repository import GObject
 from friends.utils.logging import initialize
+
+# Print all logs for debugging purposes
+initialize(debug=True, console=True)
+
 from friends.utils.account import AccountManager
-from friends.utils.base import Base
 from friends.utils.model import Model
 
-# Print all logs for debugging purposes
-initialize(debug=True, console=True)
-
 
 log = logging.getLogger('friends.debug_live')