* notifier/version.py: set version to 0.8.3

* notifier/nf_generic.py (step): remove socket if poll returned
  state POLLNVAL

* notifier/popen.py (Process.dead): check if output object is not
  None before flushing the buffer

Author: Andreas Buesching

notifier/dispatch.py

@@ -5,7 +5,7 @@
 #
 # a generic dispatcher implementation
 #
-# Copyright (C) 2006, 2007, 2009
+# Copyright (C) 2006, 2007, 2009, 2010
 #		Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify

notifier/log.py

@@ -5,7 +5,7 @@
 #
 # log - a logging facility for the generic notifier module
 #
-# Copyright (C) 2005, 2006
+# Copyright (C) 2005, 2006, 2010
 #		Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify
@@ -26,11 +26,23 @@
 import sys
 
 instance = logging.getLogger( 'notifier' )
-instance.addHandler( logging.StreamHandler( sys.stderr ) )
+formatter = logging.Formatter( "%(asctime)s: %(name)s: %(levelname)-8s: %(message)s" )
+stream = logging.StreamHandler( sys.stderr )
+stream.setFormatter( formatter )
+try:
+	file = logging.FileHandler( '/var/log/python-notifier.log' )
+	file.setFormatter( formatter )
+except:
+	pass
+
+instance.addHandler( stream )
+instance.addHandler( file )
 
 debug = instance.debug
 info = instance.info
 warn = instance.warn
 error = instance.error
 critical = instance.critical
 exception = instance.exception
+
+set_level = instance.setLevel

notifier/nf_generic.py

@@ -76,22 +76,23 @@ def socket_add( id, method, condition = IO_READ ):
 	global __sockets, __sock_objects, __poll
 
 	# ensure that already registered condition do not get lost
+	conditions = condition
 	for cond in ( IO_READ, IO_WRITE, IO_EXCEPT ):
 		if id in __sockets[ cond ]:
-			condition |= cond
+			conditions |= cond
 
 	fd = _get_fd( id )
 	if fd >= 0:
 		__sock_objects[ fd ] = id
 		__sockets[ condition ][ fd ] = method
-		__poll.register( fd, condition )
+		__poll.register( fd, conditions )
 	else:
 		raise AttributeError( 'could not get file description: %s' % id )
 
 def socket_remove( id, condition = IO_READ ):
 	"""Removes the given socket from scheduler. If no condition is
 	specified the default is IO_READ."""
-	global __sockets, __poll
+	global __sockets, __poll, __sock_objects
 
 	if condition == IO_ALL:
 		for c in ( IO_READ, IO_WRITE, IO_EXCEPT ):
@@ -104,7 +105,7 @@ def socket_remove( id, condition = IO_READ ):
 		fd = None
 		# file descriptor already closed
 		for cond in ( IO_READ, IO_WRITE, IO_EXCEPT ):
-			for deskriptor, item in __sockets[ cond ].items():
+			for descriptor, item in __sock_objects.items():
 				if item == id:
 					fd = descriptor
 					break
@@ -244,7 +245,7 @@ def step( sleep = True, external = True ):
 				# check for errors
 				if condition == select.POLLERR:
 					if fd in __sockets[ IO_EXCEPT ] and not __sockets[ IO_EXCEPT ][ fd ]( sock_obj ):
-						socket_remove( sock_obj, cond )
+						socket_remove( sock_obj, IO_EXCEPT )
 					continue
 				for cond in ( IO_READ, IO_WRITE ):
 					if cond & condition and fd in __sockets[ cond ] and \

notifier/signals.py

@@ -5,7 +5,7 @@
 #
 # a generic signal implementation for propagating asynchron events
 #
-# Copyright (C) 2005, 2006
+# Copyright (C) 2005, 2006, 2010
 #	Andreas Büsching <crunchy@bitkipper.net>
 #
 # This library is free software; you can redistribute it and/or modify