From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 11 May 2010 21:58:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/oddments/cappie
X-Git-Url: http://git.ipfire.org/?p=oddments%2Fcappie.git;a=commitdiff_plain

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

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

a8e7cbae2e04045809e48b417edeaff74f75af9e
diff --cc cappie/__init__.py
index e760f4a,4152b2f..fcabae4
--- a/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)
  
 +		util.setprocname("interface %s" % self.dev)
 +
- 		self.db.open()
- 
  		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 0db7006,4d22553..e690d13
--- a/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)