Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/cappie

Conflicts:
	cappie/__init__.py
	cappie/queue.py

diff --cc cappie/__init__.py
index e760f4ad6a5259cf8d7643c8edaf41ff4c13bddf,4152b2fd0385e6b67f11a0c85bb9f9e52acff7c7..fcabae4564094ed8567be56a5f55b4e0c822e083
--- 1/cappie/__init__.py
--- 2/cappie/__init__.py
+++ b/cappie/__init__.py
@@@ -29,9 -29,9 +29,10 @@@ from threading import Threa
  
  import protocol
  import queue
 +import util
  
  from errors import *
+ from events import *
  
  def getAllInterfaces():
        filters = ("lo", "any")
@@@ -167,10 -168,6 +169,8 @@@ class Interface(Thread)
        def run(self):
                self.log.info("Starting interface %s" % self.dev)
  
-               self.db.open()
- 
 +              util.setprocname("interface %s" % self.dev)
 +
                p = pcapy.open_live(self.dev, self.mtu, self.promisc, 0)
                p.setfilter(self.filter)
                #p.loop(0, self._callback)

diff --cc cappie/queue.py
index 0db700635652633577e0ceeb28d9ea0712f415be,4d22553644a3945c3179ffd6ad700f30632ef3ec..e690d136235dab0018114af2bf8b2b9438b1331f
--- 1/cappie/queue.py
--- 2/cappie/queue.py
+++ b/cappie/queue.py
@@@ -23,9 -23,9 +23,11 @@@ import tim
  
  from threading import Thread
  
 +import util
 +
+ from database import Database
  from errors import *
+ from events import *
  
  class Queue(Thread):
        heartbeat = 1.0
@@@ -55,8 -58,8 +60,10 @@@
        def run(self):
                self.log.debug("Started event queue")
  
 +              util.setprocname("queue")
 +
+               self.db.open()
+ 
                while self.__running or self.__queue:
                        if not self.__queue:
                                #self.log.debug("Queue sleeping for %s seconds" % self.heartbeat)