Kolab Groupware OBS

bonnie.spec Changed

bonnie-0.2.2.tar.gz/dealer.py Deleted

bonnie-0.2.2.tar.gz/.gitignore -> bonnie-0.3.0.tar.gz/.gitignore Changed

bonnie-0.2.2.tar.gz/bonnie/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/__init__.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import logging
@@ -30,9 +31,12 @@
         Return the correct logger class.
     """
     logging.setLoggerClass(Logger)
-    log = logging.getLogger(name=name)
+
+    log = logging.getLogger(name=name.replace(".", "_"))
     return log
 
+log = getLogger('bonnie')
+
 from bonnie.conf import Conf
 conf = Conf()

bonnie-0.2.2.tar.gz/bonnie/broker/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/broker/__init__.py Changed

@@ -2,21 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -27,12 +26,17 @@
 from bonnie.daemon import BonnieDaemon
 
 class BonnieBroker(BonnieDaemon):
+    """
+
+    """
     pidfile = "/var/run/bonnie/broker.pid"
 
     def __init__(self, *args, **kw):
         super(BonnieBroker, self).__init__(*args, **kw)
 
+        #: Interests are registered here.
         self.broker_interests = {}
+
         self.broker_modules = {}
 
         for _class in brokers.list_classes():

bonnie-0.2.2.tar.gz/bonnie/broker/brokers/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/broker/brokers/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py Changed

@@ -2,27 +2,30 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
     This is the ZMQ broker implementation for Bonnie.
 """
 
+import datetime
+from dateutil.parser import parse
+from dateutil.tz import tzutc
+import json
 from multiprocessing import Process
 import os
 import random
@@ -38,6 +41,8 @@
 conf = bonnie.getConf()
 log = bonnie.getLogger('bonnie.broker.ZMQBroker')
 
+from bonnie.broker.state import init_db
+
 import collector
 import job
 import worker
@@ -54,7 +59,8 @@
 
         self.routers = {}
         self.router_processes = {}
-        self.collector_interests = []
+
+        self.collector_jobs_pending = 0
 
     def register(self, callback):
         callback({ '_all': self.run })
@@ -138,17 +144,29 @@
         self.running = True
         last_expire = time.time()
         last_state = time.time()
+        last_vacuum = time.time()
+
+        try:
+            db = init_db('broker')
+            db.execute("VACUUM")
+            db.commit()
+        except Exception, errmsg:
+            pass
+
         poller_timeout = int(conf.get('broker', 'zmq_poller_timeout', 100))
 
         while self.running:
             try:
-                # TODO: adjust polling timout according to the number of pending jobs
+                # TODO: adjust polling timout according to the number
+                # of pending jobs.
                 sockets = dict(self.poller.poll(poller_timeout))
-            except KeyboardInterrupt, e:
+
+            except KeyboardInterrupt, errmsg:
                 log.info("zmq.Poller KeyboardInterrupt")
                 break
-            except Exception, e:
-                log.error("zmq.Poller error: %r", e)
+
+            except Exception, errmsg:
+                log.error("zmq.Poller error: %r", errmsg)
                 sockets = dict()
 
             for socket, event in sockets.iteritems():
@@ -159,12 +177,8 @@
                         result = getattr(router, '%s' % callforward)()
                         callback(router, result)
 
-            for _collector in collector.select_by_state(b'READY'):
-                self._send_collector_job(_collector.identity)
-
-            for _worker in worker.select_by_state(b'READY'):
-                self._send_worker_job(_worker.identity)
-
+            # Once every 30 seconds, expire stale collectors and
+            # workers, unlock jobs and expire those done.
             if last_expire < (time.time() - 30):
                 for _collector in collector.select_by_state(b'READY'):
                     self._request_collector_state(_collector.identity)
@@ -173,50 +187,14 @@
                 worker.expire()
                 job.unlock()
                 job.expire()
-                last_expire = time.time()
 
-            if last_state < (time.time() - 10):
-                stats_start = time.time()
-                jcp = job.count_by_type_and_state('collector', b'PENDING')
-                jwp = job.count_by_type_and_state('worker', b'PENDING')
-                jca = job.count_by_type_and_state('collector', b'ALLOC')
-                jwa = job.count_by_type_and_state('worker', b'ALLOC')
-
-                stats = {
-                        'cb': collector.count_by_state(b'BUSY'),
-                        'cr': collector.count_by_state(b'READY'),
-                        'cs': collector.count_by_state(b'STALE'),
-                        'ja': sum([jca, jwa]),
-                        'jca': jca,
-                        'jcp': jcp,
-                        'jd': job.count_by_state(b'DONE'),
-                        'jp': sum([jcp, jwp]),
-                        'jwa': jwa,
-                        'jwp': jwp,
-                        'jf': job.count_by_state(b'FAILED'),
-                        'jo': job.count_by_state(b'POSTPONED'),
-                        'wb': worker.count_by_state(b'BUSY'),
-                        'wr': worker.count_by_state(b'READY'),
-                        'ws': worker.count_by_state(b'STALE'),
-                    }
-                stats_end = time.time()
-
-                stats['duration'] = "%.4f" % (stats_end - stats_start)
-
-                log.info("""
-    Jobs:       done=%(jd)d, pending=%(jp)d, alloc=%(ja)d,
-                postponed=%(jo)d, failed=%(jf)d.
-    Workers:    ready=%(wr)d, busy=%(wb)d, stale=%(ws)d,
-                pending=%(jwp)d, alloc=%(jwa)d.
-    Collectors: ready=%(cr)d, busy=%(cb)d, stale=%(cs)d,
-                pending=%(jcp)d, alloc=%(jca)d.
-    Took:       seconds=%(duration)s.""" % stats)
-
-                self._write_stats(stats)
+                last_expire = time.time()
 
+            # Report on the state of jobs.
+            if last_state < (time.time() - 30):
+                self._write_stats()
                 last_state = time.time()
 
-
         log.info("Shutting down")
 
         for attrs in self.routers.values():
@@ -237,6 +215,7 @@
 
         if not hasattr(self, '_handle_cr_%s' % (cmd)):
             log.error("Unhandled CR cmd %s" % (cmd))
+            return
 
         handler = getattr(self, '_handle_cr_%s' % (cmd))
         handler(router, collector_identity, message[2:])
@@ -250,9 +229,23 @@
         log.debug("Dealer Router Message: %r" % (message), level=8)
         dealer_identity = message[0]
         notification = message[1]
+
+        done = False
+        attempts = 0
+        while not done:
+            attempts += 1
+            try:
+                _job = job.add(dealer_identity, notification)
+                if not _job == None:
+                    done = True
+            except Exception, errmsg:
+                if attempts % 10 == 0:
+                    log.error("Dealer Router cannot add jobs: %r" % (errmsg))
+
         stream.send_multipart([dealer_identity, b'ACK'])
 
-        job.add(dealer_identity, notification)
+        if not _job == None:
+            log.info("Job %s NEW by %s" % (_job.uuid, dealer_identity))
 
     def _cb_wr_recv_multipart(self, router, message):
         log.debug("Worker Router Message: %r" % (message), level=8)
@@ -269,23 +262,15 @@
     def _cb_wcr_recv_multipart(self, router, message):
         log.debug("Worker Controller Router Message: %r" % (message), level=8)

bonnie-0.2.2.tar.gz/bonnie/broker/brokers/zmq_broker/collector.py -> bonnie-0.3.0.tar.gz/bonnie/broker/brokers/zmq_broker/collector.py Changed

@@ -2,21 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import datetime
@@ -99,6 +98,11 @@
 
     collector = db.query(Collector).filter_by(identity=identity).first()
 
+    if collector == None:
+        db.add(Collector(identity))
+        db.commit()
+        collector = db.query(Collector).filter_by(identity=identity).first()
+
     for attr, value in kw.iteritems():
         setattr(collector, attr, value)
 
@@ -107,6 +111,17 @@
 def expire():
     db = init_db('collectors')
 
+    for collector in db.query(Collector).filter(Collector.timestamp <= (datetime.datetime.utcnow() - datetime.timedelta(0, 90)), Collector.state == b'STALE').all():
+        log.debug("Purging collector %s as very stale" % (collector.identity), level=7)
+        if not collector.job == None:
+            _job = db.query(Job).filter_by(id=collector.job).first()
+            if not _job == None:
+                _job.state = b'PENDING'
+                _job.timestamp = datetime.datetime.utcnow()
+
+        db.delete(collector)
+        db.commit()
+
     for collector in db.query(Collector).filter(Collector.timestamp <= (datetime.datetime.utcnow() - datetime.timedelta(0, 90)), Collector.state != b'STALE').all():
         log.debug("Marking collector %s as stale" % (collector.identity), level=7)
         if not collector.job == None:

bonnie-0.2.2.tar.gz/bonnie/broker/brokers/zmq_broker/job.py -> bonnie-0.3.0.tar.gz/bonnie/broker/brokers/zmq_broker/job.py Changed

@@ -2,27 +2,27 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import datetime
 import time
 
 from sqlalchemy.exc import IntegrityError
+from sqlalchemy.exc import OperationalError
 
 import bonnie
 conf = bonnie.getConf()
@@ -37,11 +37,26 @@
         Add a new job.
     """
     db = init_db('jobs')
+
+    if db == None:
+        return None
+
+    job = None
+
     try:
-        db.add(Job(dealer, notification, job_type))
+        job = Job(dealer, notification, job_type)
+        db.add(job)
         db.commit()
     except IntegrityError, errmsg:
+        log.error("SQLAlchemy Integrity Error: %r" % (errmsg))
         db.rollback()
+        return None
+    except OperationalError, errmsg:
+        log.error("SQLAlchemy Operational Error: %r" % (errmsg))
+        db.rollback()
+        return None
+
+    return job
 
 def count():
     db = init_db('jobs')
@@ -63,6 +78,11 @@
     result = db.query(Job).filter_by(job_type=job_type, state=state).count()
     return result
 
+def first():
+    db = init_db('jobs')
+    result = db.query(Job).filter(Job.state != b'DONE').order_by(Job.id).first()
+    return result
+
 def select(job_uuid):
     db = init_db('jobs')
     result = db.query(Job).filter_by(uuid=job_uuid).first()
@@ -104,12 +124,16 @@
 
     # This results in following the storage order and is by far the
     # fastest methodology.
-    job = db.query(Job).filter_by(collector=identity, job_type='collector', state=b'PENDING').first()
+    job = db.query(Job).filter_by(collector=identity, job_type='collector', state=b'PENDING').order_by(Job.id).first()
 
-    if not job == None:
-        job.state = b'ALLOC'
-        job.timestamp = datetime.datetime.utcnow()
-        db.commit()
+    if job == None:
+        return
+
+    job.state = b'ALLOC'
+    job.timestamp = datetime.datetime.utcnow()
+    collector.job = job.id
+    collector.state = b'BUSY'
+    db.commit()
 
     return job
 
@@ -134,12 +158,15 @@
 
     # This results in following the storage order and is by far the
     # fastest methodology.
-    job = db.query(Job).filter_by(job_type='worker', state=b'PENDING').first()
+    job = db.query(Job).filter_by(job_type='worker', state=b'PENDING').order_by(Job.id).first()
 
-    if not job == None:
-        job.state = b'ALLOC'
-        job.timestamp = datetime.datetime.utcnow()
-        db.commit()
+    if job == None:
+        return
+
+    job.state = b'ALLOC'
+    worker.job = job.id
+    worker.state = b'BUSY'
+    db.commit()
 
     return job
 
@@ -178,7 +205,9 @@
     """
     db = init_db('jobs')
 
-    for job in db.query(Job).filter(Job.timestamp <= (datetime.datetime.utcnow() - datetime.timedelta(0, 300)), Job.state == b'DONE').all():
+    job_retention = (int)(conf.get("broker", "job_retention", 300))
+
+    for job in db.query(Job).filter(Job.timestamp <= (datetime.datetime.utcnow() - datetime.timedelta(0, job_retention)), Job.state == b'DONE').all():
         log.debug("Purging job %s" % (job.uuid), level=7)
         db.delete(job)

bonnie-0.2.2.tar.gz/bonnie/broker/brokers/zmq_broker/worker.py -> bonnie-0.3.0.tar.gz/bonnie/broker/brokers/zmq_broker/worker.py Changed

@@ -2,21 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import datetime

bonnie-0.2.2.tar.gz/bonnie/broker/state.py -> bonnie-0.3.0.tar.gz/bonnie/broker/state.py Changed

@@ -1,22 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import datetime
@@ -37,6 +36,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import relationship
+from sqlalchemy.schema import Index
 
 try:
     from sqlalchemy.orm import relationship
@@ -120,6 +120,10 @@
         self.cmd = None
         self.pushbacks = 0
 
+Index('job_collector', 'collector')
+Index('job_job_type', 'job_type')
+Index('job_state', 'state')
+
 class Worker(DeclarativeBase):
     __tablename__ = 'worker'
 
@@ -153,11 +157,11 @@
     try:
         engine = create_engine(db_uri, echo=echo)
         DeclarativeBase.metadata.create_all(engine)
-    except:
-        engine = create_engine('sqlite:////tmp/state.db')
-        DeclarativeBase.metadata.create_all(engine)
+    except Exception, errmsg:
+        log.error("Exception occurred: %r" % (errmsg))
+        return None
 
-    Session = sessionmaker(bind=engine)
+    Session = sessionmaker(bind=engine,autoflush=True)
     db = Session()
 
     return db

bonnie-0.2.2.tar.gz/bonnie/collector/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/collector/__init__.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os

bonnie-0.2.2.tar.gz/bonnie/collector/handlers/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/collector/handlers/__init__.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 from messagedata import MessageDataHandler
 from imapdata import IMAPDataHandler
 from ldapdata import LDAPDataHandler
@@ -13,4 +33,4 @@
         MessageDataHandler,
         IMAPDataHandler,
         LDAPDataHandler
-    ]
\ No newline at end of file
+    ]

bonnie-0.2.2.tar.gz/bonnie/collector/handlers/imapdata.py -> bonnie-0.3.0.tar.gz/bonnie/collector/handlers/imapdata.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import json
@@ -43,9 +44,13 @@
 
     def register(self, callback):
         interests = {
-            'GETMETADATA':  { 'callback': self.get_imap_folder_metadata },
-            'GETACL':  { 'callback': self.get_imap_folder_acl }
-        }
+                'GETMETADATA': {
+                        'callback': self.get_imap_folder_metadata
+                    },
+                'GETACL': {
+                        'callback': self.get_imap_folder_acl
+                    }
+            }
 
         callback(interests)

bonnie-0.2.2.tar.gz/bonnie/collector/handlers/ldapdata.py -> bonnie-0.3.0.tar.gz/bonnie/collector/handlers/ldapdata.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import json
@@ -44,8 +45,8 @@
 
     def register(self, callback):
         interests = {
-            'GETUSERDATA': { 'callback': self.get_user_data }
-        }
+                'GETUSERDATA': { 'callback': self.get_user_data }
+            }
 
         callback(interests)

bonnie-0.2.2.tar.gz/bonnie/collector/handlers/messagedata.py -> bonnie-0.3.0.tar.gz/bonnie/collector/handlers/messagedata.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os
@@ -39,9 +40,13 @@
 
     def register(self, callback):
         interests = {
-            'FETCH':  { 'callback': self.retrieve_contents_for_messages },
-            'HEADER': { 'callback': self.retrieve_headers_for_messages }
-        }
+                'FETCH':  {
+                        'callback': self.retrieve_contents_for_messages
+                    },
+                'HEADER': {
+                        'callback': self.retrieve_headers_for_messages
+                    }
+            }
 
         callback(interests)

bonnie-0.2.2.tar.gz/bonnie/collector/inputs/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/collector/inputs/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/collector/inputs/zmq_input.py -> bonnie-0.3.0.tar.gz/bonnie/collector/inputs/zmq_input.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -83,22 +81,22 @@
             Receive a message on the Collector Router.
         """
         log.debug("Collector Router Message: %r" % (message), level=8)
-        collector_identity = message[0]
+        cmd = message[0]
 
-        if message[0] == b"STATE" or not self.state == b"READY":
+        if cmd == b"STATE":
             self.report_state()
         else:
             job_uuid = message[1]
             notification = message[2]
 
             if not self.notify_callback == None:
-                self.notify_callback(message[0], job_uuid, notification)
+                self.notify_callback(cmd, job_uuid, notification)
 
     def callback_done(self, job_uuid, result):
         log.debug("Handler callback done for job %s: %r" % (job_uuid, result), level=8)
         self.report_timestamp = time.time()
         self.collector.send_multipart([b"DONE", job_uuid, result])
-        log.debug("Handler results sent for job %s" % (job_uuid), level=7)
+        log.info("Job %s DONE by %s" % (job_uuid, self.identity))
 
     def terminate(self):
         log.info("[%s] shutting down", self.identity)

bonnie-0.2.2.tar.gz/bonnie/conf.py -> bonnie-0.3.0.tar.gz/bonnie/conf.py Changed

bonnie-0.2.2.tar.gz/bonnie/daemon.py -> bonnie-0.3.0.tar.gz/bonnie/daemon.py Changed

@@ -1,22 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os
@@ -25,11 +24,22 @@
 import pwd
 import signal
 import traceback
+
 import bonnie
 conf = bonnie.getConf()
 log = bonnie.getLogger('bonnie')
 
 class BonnieDaemon(object):
+    """
+        A standard daemon process abstraction layer for Bonnie.
+
+        This class provides the following capabilities for Bonnie
+        daemons (through inheritance):
+
+        *   standard command-line options
+        *   :func:`dropping privileges <drop_privileges>`
+        *   :func:`signal handling <signal_handlers>`
+    """
     pidfile = "/var/run/bonnie/bonnie.pid"
 
     def __init__(self, *args, **kw):
@@ -76,7 +86,8 @@
 
     def run(self, *args, **kw):
         """
-            The daemon main loop
+            The daemon main loop. Override this function in a
+            :class:`BonnieDaemon` sub-class.
         """
         pass
 
@@ -224,7 +235,7 @@
     """
         This forks the current process into a daemon.
     """
-    # do the UNIX double-fork magic, see Stevens' "Advanced 
+    # do the UNIX double-fork magic, see Stevens' "Advanced
     # Programming in the UNIX Environment" for details (ISBN 0201563177)
     try:
         pid = os.fork()

bonnie-0.2.2.tar.gz/bonnie/dealer/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/dealer/__init__.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import json
@@ -53,6 +51,9 @@
         if event in exclude_events:
             return False
 
+        if user == None:
+            return True
+
         blacklist_events = conf.get('dealer', 'blacklist_events', None)
         if not blacklist_events == None:
             blacklist_events = blacklist_events.split(',')
@@ -66,7 +67,7 @@
             blacklist_users = []
 
         # ignore blacklisted events for blacklisted users
-        if event in blacklist_events and user is not None and user in blacklist_users:
+        if event in blacklist_events and user in blacklist_users:
             return False
 
         return True

bonnie-0.2.2.tar.gz/bonnie/dealer/outputs/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/dealer/outputs/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/dealer/outputs/file_output.py -> bonnie-0.3.0.tar.gz/bonnie/dealer/outputs/file_output.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os

bonnie-0.2.2.tar.gz/bonnie/dealer/outputs/zmq_output.py -> bonnie-0.3.0.tar.gz/bonnie/dealer/outputs/zmq_output.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import os

bonnie-0.2.2.tar.gz/bonnie/logger.py -> bonnie-0.3.0.tar.gz/bonnie/logger.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import grp

bonnie-0.2.2.tar.gz/bonnie/plugins/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/plugins/__init__.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import logging

bonnie-0.2.2.tar.gz/bonnie/translate.py -> bonnie-0.3.0.tar.gz/bonnie/translate.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 try:

bonnie-0.2.2.tar.gz/bonnie/utils.py -> bonnie-0.3.0.tar.gz/bonnie/utils.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/worker/__init__.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import json
@@ -37,6 +35,11 @@
 log = bonnie.getLogger('bonnie.worker')
 
 class BonnieWorker(BonnieDaemon):
+    """
+        Bonnie Worker specific version of a :class:`Bonnie Daemon <bonnie.daemon.BonnieDaemon>`
+    """
+
+    #: The process ID file to use.
     pidfile = "/var/run/bonnie/worker.pid"
 
     def __init__(self, *args, **kw):
@@ -59,7 +62,9 @@
 
     def run(self):
         """
-            Daemon main loop
+            The Bonnie worker main loop, responsible for creating
+            :class:`worker processes
+            <bonnie.worker.BonnieWorkerProcess>`
         """
         num_childs = conf.num_childs or conf.get('worker', 'num_childs')
         if num_childs is not None:
@@ -93,11 +98,15 @@
 
     def run_child(self):
         """
-            This method is being run in a separate process
+            Target method for :class:`worker processes
+            <bonnie.worker.BonnieWorkerProcess>`
         """
         BonnieWorkerProcess(as_child=True).run()
 
     def terminate(self, *args, **kw):
+        """
+            Stop the worker daemon.
+        """
         self.running = False
         for p in self.childs:
             p.terminate()
@@ -106,16 +115,26 @@
             for p in self.childs:
                 p.join()
 
-
 class BonnieWorkerProcess(object):
+    #: Holder of interests registered by handlers
     handler_interests = { '_all': [] }
+
+    #: Holder of interests registered by input channel modules
     input_interests = {}
+
+    #: Holder of interests registered by storage channel modules
     storage_interests = {}
+
+    #: Holder of interests registered by output channel modules
     output_interests = {}
 
+    #: Lists registered handler modules
     handler_modules = {}
+    #: Lists registered input modules
     input_modules = {}
+    #: Lists registered storage modules
     storage_modules = {}
+    #: Lists registered output modules
     output_modules = {}
 
     output_exclude_events = []
@@ -169,19 +188,97 @@
 
         if self.handler_interests.has_key(event):
             for interest in self.handler_interests[event]:
-                (notification, _jobs) = self.interest_callback(interest, notification)
-                jobs.extend(_jobs)
+                (notification, _jobs) = self.interest_callback(
+                        interest,
+                        notification
+                    )
+
+                if len(_jobs) > 0:
+                    log.debug(
+                            "Handler interest %r for event %s returns jobs: %r" % (
+                                    interest,
+                                    event,
+                                    _jobs
+                                ),
+                            level = 6
+                        )
+
+                    jobs.extend(_jobs)
 
         for interest in self.handler_interests['_all']:
-            (notification, _jobs) = self.interest_callback(interest, notification)
-            jobs.extend(_jobs)
+            (notification, _jobs) = self.interest_callback(
+                    interest,
+                    notification
+                )
+
+            if len(_jobs) > 0:
+                log.debug(
+                        "Handler interest %r for _all returns jobs: %r" % (
+                                interest,
+                                _jobs
+                            ),
+                        level = 6
+                    )
+
+                jobs.extend(_jobs)
+
+        jobs = list(set(jobs))
+
+        if len(jobs) > 0:
+            log.debug(
+                    "Handler interests included jobs: %r" % (jobs),
+                    level = 6
+                )
 
-        # trigger storage modules which registered interest in particular notification properties
+        handler_jobs_num = len(jobs)
+
+        # trigger storage modules which registered interest in
+        # particular notification properties.
         for prop,storage_interests in self.storage_interests.iteritems():
             if notification.has_key(prop):
                 for interest in storage_interests:
-                    (notification, _jobs) = self.interest_callback(interest, notification)
-                    jobs.extend(_jobs)
+                    log.debug(
+                            "Storage interest %s for property %s to be executed" % (
+                                    interest,
+                                    prop
+                                ),
+                            level = 6
+                        )
+
+                    (notification, _jobs) = self.interest_callback(
+                            interest,
+                            notification
+                        )
+
+                    if len(_jobs) > 0:
+                        log.debug(
+                                "Storage interest %r for %r returns jobs: %r" % (
+                                        interest,
+                                        prop,
+                                        _jobs
+                                    ),
+                                level = 6
+                            )
+
+                        jobs.extend(_jobs)
+
+            else:
+                log.debug(
+                        "Storage interests for property %s not (yet) relevant" % (
+                                prop
+                            ),
+                        level = 6
+                    )
+
+        jobs = list(set(jobs))
+
+        if len(jobs) > handler_jobs_num:
+            log.debug(
+                    "Storage interests included additional jobs: %r" % (
+                            jobs
+                        ),
+                    level = 6
+                )

bonnie-0.2.2.tar.gz/bonnie/worker/constants.py -> bonnie-0.3.0.tar.gz/bonnie/worker/constants.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/aclchange.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/aclchange.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -24,6 +25,10 @@
 from bonnie.worker.handlers import MailboxHandlerBase
 
 class AclChangeHandler(MailboxHandlerBase):
+    """
+        Handler for an event that changes the ACL on an object.
+    """
+
     event = 'AclChange'
 
     def __init__(self, *args, **kw):

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/base.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/base.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/changelog.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/changelog.py Changed

@@ -1,20 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/flagsclear.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/flagsclear.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/flagsset.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/flagsset.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/login.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/login.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -24,7 +25,29 @@
 from bonnie.worker.handlers import HandlerBase
 
 class LoginHandler(HandlerBase):
+    """
+        A *Login* event notification handler.
+
+        The event notification is a JSON object with the following
+        layout::
+
+            {
+                    "event":"Login",
+                    "timestamp":"2014-11-27T10:45:38.201+01:00",
+                    "service":"imap",
+                    "serverDomain":"10.8.14.13",
+                    "serverPort":143,
+                    "clientIP":"10.8.13.10",
+                    "clientPort":45735,
+                    "uri":"imap://imapb13.example.org",
+                    "pid":14210,
+                    "user":"alexander.aachen@example.org",
+                    "vnd.cmu.sessionId":"cyrus-imapd-14210-1417081537-1-10541965771286434889"
+                }
+
+    """
+
     event = 'Login'
 
     def __init__(self, *args, **kw):
-        HandlerBase.__init__(self, *args, **kw)
+        super(LoginHandler, self).__init__(*args, **kw)

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/logout.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/logout.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -32,11 +33,12 @@
     event = 'Logout'
 
     def __init__(self, *args, **kw):
-        HandlerBase.__init__(self, *args, **kw)
+        super(LogoutHandler, self).__init__(*args, **kw)
 
     def run(self, notification):
-        # lookup corresponding Login event and update that record with logout_time
-        # and suppress separate logging of this event with notification['_suppress_output'] = True
+        # lookup corresponding Login event and update that record with
+        # logout_time and suppress separate logging of this event with
+        # notification['_suppress_output'] = True.
         if notification.has_key('vnd.cmu.sessionId'):
             now = datetime.datetime.now(tzutc())
             attempts = 4
@@ -80,4 +82,4 @@
             # push back into the job queue, the corresponding Login event may not yet have been processed.
             return (notification, [b"POSTPONE"])
 
-        return super(LogoutHandler, self).run(notification)
\ No newline at end of file
+        return super(LogoutHandler, self).run(notification)

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxbase.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxbase.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxcreate.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxcreate.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxdelete.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxdelete.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxrename.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxrename.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxsubscribe.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxsubscribe.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/mailboxunsubscribe.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/mailboxunsubscribe.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messageappend.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messageappend.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -27,11 +28,11 @@
     event = 'MessageAppend'
 
     def __init__(self, *args, **kw):
-        MessageHandlerBase.__init__(self, *args, **kw)
+        super(MessageAppendHandler, self).__init__(*args, **kw)
 
     def run(self, notification):
         # call super for some basic notification processing
-        (notification, jobs) = super(MessageHandlerBase, self).run(notification)
+        (notification, jobs) = super(MessageAppendHandler, self).run(notification)
 
         if not notification.has_key('messageContent') or notification['messageContent'] in [None, ""]:
             self.log.debug("Adding FETCH job for " + self.event, level=8)

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messagebase.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messagebase.py Changed

@@ -1,40 +1,46 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""
-    Base handler for an event notification of type 'Message*'
-"""
-
 import bonnie
+
+from bonnie.utils import parse_imap_uri
 from bonnie.worker.handlers import HandlerBase
 
 class MessageHandlerBase(HandlerBase):
     event = None
 
     def __init__(self, *args, **kw):
-        HandlerBase.__init__(self, *args, **kw)
+        super(MessageHandlerBase, self).__init__(*args, **kw)
         self.log = bonnie.getLogger('bonnie.worker.' + self.event)
 
     def run(self, notification):
         # call super for some basic notification processing
         (notification, jobs) = super(MessageHandlerBase, self).run(notification)
 
+        # Insert the URI UID (if it exists) in to uidset for further handlers
+        if notification.has_key('uri') and notification.has_key('uidset'):
+            uri = parse_imap_uri(notification['uri'])
+
+            if uri.has_key('UID'):
+                notification['uidset'] = uri['UID']
+
         # message notifications require message headers
         if not notification.has_key('messageHeaders'):
             self.log.debug("Adding HEADER job for " + self.event, level=8)

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messagecopy.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messagecopy.py Changed

@@ -2,28 +2,29 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-"""
-    Base handler for an event notification of type 'MessageCopy'
-"""
-
 from bonnie.worker.handlers import MessageHandlerBase
 
 class MessageCopyHandler(MessageHandlerBase):
+    """
+        Handler for a *MessageCopy* event.
+    """
+
     event = 'MessageCopy'
 
     def __init__(self, *args, **kw):

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messageexpire.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messageexpire.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messageexpunge.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messageexpunge.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messagemove.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messagemove.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messagenew.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messagenew.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -27,4 +28,4 @@
     event = 'MessageNew'
 
     def __init__(self, *args, **kw):
-        MessageAppendHandler.__init__(self, *args, **kw)
+        super(MessageNewHandler, self).__init__(*args, **kw)

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messageread.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messageread.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/messagetrash.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/messagetrash.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/quotachange.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/quotachange.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/quotaexceeded.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/quotaexceeded.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/handlers/quotawithin.py -> bonnie-0.3.0.tar.gz/bonnie/worker/handlers/quotawithin.py Changed

@@ -2,19 +2,20 @@
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """

bonnie-0.2.2.tar.gz/bonnie/worker/inputs/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/worker/inputs/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/inputs/zmq_input.py -> bonnie-0.3.0.tar.gz/bonnie/worker/inputs/zmq_input.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """
@@ -27,6 +25,7 @@
 """
 
 import os
+import random
 import socket
 import time
 import zmq
@@ -43,6 +42,7 @@
         self.job_uuid = None
         self.lastping = 0
         self.report_timestamp = 0
+        self.busy_start = 0
 
     def name(self):
         return 'zmq_input'
@@ -51,6 +51,9 @@
         pass
 
     def report_state(self):
+        if self.busy_start < (time.time() - 90):
+            self.set_state_ready()
+
         log.debug("[%s] reporting state: %s" % (self.identity, self.state), level=8)
         message = [b"STATE", self.state]
 
@@ -106,7 +109,7 @@
 
             now = time.time()
 
-            if self.report_timestamp < (now - 60):
+            if self.report_timestamp < (time.time() - 10):
                 self.report_state()
 
             if self.controller in sockets:
@@ -145,11 +148,15 @@
                             self.controller.send_multipart([b"DONE", self.job_uuid])
                         else:
                             log.debug("[%s] Has jobs: %r" % (self.identity, jobs), level=8)
-                            self.controller.send_multipart([b" ".join(jobs), self.job_uuid])
+
+                            if b'POSTPONE' in jobs:
+                                self.controller.send_multipart([b'POSTPONE', self.job_uuid])
+                            else:
+                                self.controller.send_multipart([b'COLLECT', b" ".join(jobs), self.job_uuid, notification])
 
                         self.set_state_ready()
 
-            if report is not None and self.lastping < (now - 60):
+            if report is not None and self.lastping < (now - random.randint(55,65)):
                 report()
                 self.lastping = now
 
@@ -159,6 +166,7 @@
     def set_state_busy(self, _job_id):
         log.debug("[%s] Set state to BUSY" % (self.identity), level=9)
         self.report_timestamp = time.time()
+        self.busy_start = time.time()
         self.state = b"BUSY"
         self.job_uuid = _job_id

bonnie-0.2.2.tar.gz/bonnie/worker/outputs/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/worker/outputs/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/outputs/elasticsearch_output.py -> bonnie-0.3.0.tar.gz/bonnie/worker/outputs/elasticsearch_output.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import datetime
 
 from dateutil.parser import parse
@@ -58,6 +78,7 @@
             }
 
         log = { '@version': bonnie.API_VERSION }
+
         for key,val in notification.iteritems():
             newkey = keymap[key] if keymap.has_key(key) else key
             if newkey is not None:

bonnie-0.2.2.tar.gz/bonnie/worker/storage/__init__.py -> bonnie-0.3.0.tar.gz/bonnie/worker/storage/__init__.py Changed

bonnie-0.2.2.tar.gz/bonnie/worker/storage/caching.py -> bonnie-0.3.0.tar.gz/bonnie/worker/storage/caching.py Changed

@@ -1,22 +1,21 @@
 # -*- coding: utf-8 -*-
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
-# Thomas Bruederli <bruederli at kolabsys.com>
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import time

bonnie-0.2.2.tar.gz/bonnie/worker/storage/elasticsearch_storage.py -> bonnie-0.3.0.tar.gz/bonnie/worker/storage/elasticsearch_storage.py Changed

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-#
 # Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
 #
 # Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
 #
-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later
-# version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
+# GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-# USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 import re
@@ -49,16 +47,20 @@
     users_doctype = 'user'
 
     def __init__(self, *args, **kw):
-        elasticsearch_output_address = conf.get('worker', 'elasticsearch_storage_address')
+        elasticsearch_output_address = conf.get(
+                'worker',
+                'elasticsearch_storage_address'
+            )
 
         if elasticsearch_output_address == None:
             elasticsearch_output_address = 'localhost'
 
         self.es = elasticsearch.Elasticsearch(
-            host=elasticsearch_output_address
-        )
+                host=elasticsearch_output_address
+            )
 
-        # use dicts with automatic expiration for caching user/folder lookups
+        # use dicts with automatic expiration for caching user/folder
+        # lookups
         self.user_id_cache = CachedDict(300)
         self.folder_id_cache = CachedDict(120)
 
@@ -67,11 +69,20 @@
 
     def register(self, callback, **kw):
         if callback is not None:
-            self.worker = callback(interests={
-                'uidset': { 'callback': self.resolve_folder_uri },
-                'folder_uniqueid': { 'callback': self.resolve_folder_uri },
-                'mailboxID': { 'callback': self.resolve_folder_uri, 'kw': { 'attrib': 'mailboxID' } }
-            })
+            self.worker = callback(
+                    interests = {
+                            'uidset': {
+                                    'callback': self.resolve_folder_uri
+                                },
+                            'folder_uniqueid': {
+                                    'callback': self.resolve_folder_uri
+                                },
+                            'mailboxID': {
+                                    'callback': self.resolve_folder_uri,
+                                    'kw': { 'attrib': 'mailboxID' }
+                                }
+                        }
+                )
 
     def get(self, key, index=None, doctype=None, fields=None, **kw):
         """
@@ -81,85 +92,128 @@
         _doctype = doctype or self.default_doctype
         try:
             res = self.es.get(
-                index=_index,
-                doc_type=_doctype,
-                id=key,
-                _source_include=fields or '*'
-            )
-            log.debug("ES get result for %s/%s/%s: %r" % (_index, _doctype, key, res), level=8)
+                    index = _index,
+                    doc_type = _doctype,
+                    id = key,
+                    _source_include = fields or '*'
+                )
+
+            log.debug(
+                    "ES get result for %s/%s/%s: %r" % (
+                            _index,
+                            _doctype,
+                            key,
+                            res
+                        ),
+                    level = 8
+                )
 
             if res['found']:
                 result = self._transform_result(res)
             else:
                 result = None
 
-        except elasticsearch.exceptions.NotFoundError, e:
-            log.debug("ES entry not found for %s/%s/%s: %r" % (_index, _doctype, key, e))
+        except elasticsearch.exceptions.NotFoundError, errmsg:
+            log.debug(
+                    "ES entry not found for %s/%s/%s: %r" % (
+                            _index,
+                            _doctype,
+                            key,
+                            errmsg
+                        )
+                )
+
             result = None
 
-        except Exception, e:
-            log.warning("ES get exception: %r", e)
+        except Exception, errmsg:
+            log.warning("ES get exception: %r" % (errmsg))
             result = None
 
         return result
 
-
     def set(self, key, value, index=None, doctype=None, **kw):
         """
             Standard API for writing to key/value storage
         """
         _index = index or self.default_index
         _doctype = doctype or self.default_doctype
+
         try:
             existing = self.es.get(
-                index=_index,
-                doc_type=_doctype,
-                id=key,
-                fields=None
-            )
-            log.debug("ES get result for %s/%s/%s: %r" % (_index, _doctype, key, existing), level=8)
+                    index = _index,
+                    doc_type = _doctype,
+                    id = key,
+                    fields = None
+                )
 
-        except elasticsearch.exceptions.NotFoundError, e:
+            log.debug(
+                    "ES get result for %s/%s/%s: %r" % (
+                            _index,
+                            _doctype,
+                            key,
+                            existing
+                        ),
+                    level = 8
+                )
+
+        except elasticsearch.exceptions.NotFoundError, errmsg:
             existing = None
 
-        except Exception, e:
-            log.warning("ES get exception: %r", e)
+        except Exception, errmsg:
+            log.warning("ES get exception: %r" % (errmsg))
             existing = None
 
         if existing is None:
             try:
                 ret = self.es.create(
-                    index=_index,
-                    doc_type=_doctype,
-                    id=key,
-                    body=value,
-                    consistency='one',
-                    replication='async'
-                )
-                log.debug("Created ES object for %s/%s/%s: %r" % (_index, _doctype, key, ret), level=8)
-
-            except Exception, e:
-                log.warning("ES create exception: %r", e)
+                        index = _index,
+                        doc_type = _doctype,
+                        id = key,
+                        body = value,
+                        consistency = 'one',
+                        replication = 'async'
+                    )
+
+                log.debug(
+                        "Created ES object for %s/%s/%s: %r" % (

bonnie-0.2.2.tar.gz/broker.py -> bonnie-0.3.0.tar.gz/broker.py Changed

bonnie-0.2.2.tar.gz/collector.py -> bonnie-0.3.0.tar.gz/collector.py Changed

bonnie-0.3.0.tar.gz/dealer-async.py Added

@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import json
+import os
+import sys
+
+from bonnie.dealer import BonnieDealer
+
+if __name__ == "__main__":
+    notification = sys.stdin.read().strip()
+
+    newpid = os.fork()
+
+    if newpid == 0:
+        dealer = BonnieDealer()
+        dealer.run(notification)

bonnie-0.3.0.tar.gz/dealer-sync.py Added

@@ -0,0 +1,38 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import json
+import os
+import sys
+
+from bonnie.dealer import BonnieDealer
+
+if __name__ == "__main__":
+    notification = sys.stdin.read().strip()
+
+    dealer = BonnieDealer()
+    dealer.run(notification)
+
+#    newpid = os.fork()
+#
+#    if newpid == 0:
+#        dealer = BonnieDealer()
+#        dealer.run(notification)

bonnie-0.3.0.tar.gz/docs Added

bonnie-0.3.0.tar.gz/docs/Makefile Added

@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+BUILDDIR      = _build
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html       to make standalone HTML files"
+	@echo "  dirhtml    to make HTML files named index.html in directories"
+	@echo "  singlehtml to make a single large HTML file"
+	@echo "  pickle     to make pickle files"
+	@echo "  json       to make JSON files"
+	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  qthelp     to make HTML files and a qthelp project"
+	@echo "  devhelp    to make HTML files and a Devhelp project"
+	@echo "  epub       to make an epub"
+	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
+	@echo "  text       to make text files"
+	@echo "  man        to make manual pages"
+	@echo "  texinfo    to make Texinfo files"
+	@echo "  info       to make Texinfo files and run them through makeinfo"
+	@echo "  gettext    to make PO message catalogs"
+	@echo "  changes    to make an overview of all changed/added/deprecated items"
+	@echo "  linkcheck  to check all external links for integrity"
+	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+	-rm -rf $(BUILDDIR)/*
+
+html:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+	@echo
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+	@echo
+	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+json:
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Bonnie.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Bonnie.qhc"
+
+devhelp:
+	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+	@echo
+	@echo "Build finished."
+	@echo "To view the help file:"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Bonnie"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Bonnie"
+	@echo "# devhelp"
+
+epub:
+	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+	@echo
+	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Run \`make' in that directory to run these through (pdf)latex" \
+	      "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+	@echo "Running LaTeX files through pdflatex..."
+	$(MAKE) -C $(BUILDDIR)/latex all-pdf
+	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+	@echo
+	@echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+	@echo
+	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo
+	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+	@echo "Run \`make' in that directory to run these through makeinfo" \
+	      "(use \`make info' here to do that automatically)."
+
+info:
+	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+	@echo "Running Texinfo files through makeinfo..."
+	make -C $(BUILDDIR)/texinfo info
+	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+	@echo
+	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+	@echo
+	@echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+	@echo "Testing of doctests in the sources finished, look at the " \
+	      "results in $(BUILDDIR)/doctest/output.txt."

bonnie-0.3.0.tar.gz/docs/_static Added

bonnie-0.3.0.tar.gz/docs/_static/basic.css_t Added

@@ -0,0 +1,541 @@
+/*
+ * basic.css
+ * ~~~~~~~~~
+ *
+ * Sphinx stylesheet -- basic theme.
+ *
+ * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
+ * :license: BSD, see LICENSE for details.
+ *
+ */
+
+/* -- main layout ----------------------------------------------------------- */
+
+div.clearer {
+    clear: both;
+}
+
+/* -- relbar ---------------------------------------------------------------- */
+
+div.related {
+    width: 100%;
+    font-size: 90%;
+}
+
+div.related h3 {
+    display: none;
+}
+
+div.related ul {
+    margin: 0;
+    padding: 0 0 0 10px;
+    list-style: none;
+}
+
+div.related li {
+    display: inline;
+}
+
+div.related li.right {
+    float: right;
+    margin-right: 5px;
+}
+
+/* -- sidebar --------------------------------------------------------------- */
+
+div.sphinxsidebarwrapper {
+    padding: 10px 5px 0 10px;
+}
+
+div.sphinxsidebar {
+    float: left;
+    width: 230px;
+    margin-left: -100%;
+    font-size: 90%;
+}
+
+div.sphinxsidebar ul {
+    list-style: none;
+}
+
+div.sphinxsidebar ul ul,
+div.sphinxsidebar ul.want-points {
+    margin-left: 20px;
+    list-style: square;
+}
+
+div.sphinxsidebar ul ul {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+div.sphinxsidebar form {
+    margin-top: 10px;
+}
+
+div.sphinxsidebar input {
+    border: 1px solid #98dbcc;
+    font-family: sans-serif;
+    font-size: 1em;
+}
+
+div.sphinxsidebar #searchbox input[type="text"] {
+    width: 170px;
+}
+
+div.sphinxsidebar #searchbox input[type="submit"] {
+    width: 30px;
+}
+
+img {
+    max-width: 100%;
+    border: 0;
+}
+
+/* -- search page ----------------------------------------------------------- */
+
+ul.search {
+    margin: 10px 0 0 20px;
+    padding: 0;
+}
+
+ul.search li {
+    padding: 5px 0 5px 20px;
+    background-image: url(file.png);
+    background-repeat: no-repeat;
+    background-position: 0 7px;
+}
+
+ul.search li a {
+    font-weight: bold;
+}
+
+ul.search li div.context {
+    color: #888;
+    margin: 2px 0 0 30px;
+    text-align: left;
+}
+
+ul.keywordmatches li.goodmatch a {
+    font-weight: bold;
+}
+
+/* -- index page ------------------------------------------------------------ */
+
+table.contentstable {
+    width: 90%;
+}
+
+table.contentstable p.biglink {
+    line-height: 150%;
+}
+
+a.biglink {
+    font-size: 1.3em;
+}
+
+span.linkdescr {
+    font-style: italic;
+    padding-top: 5px;
+    font-size: 90%;
+}
+
+/* -- general index --------------------------------------------------------- */
+
+table.indextable {
+    width: 100%;
+}
+
+table.indextable td {
+    text-align: left;
+    vertical-align: top;
+}
+
+table.indextable dl, table.indextable dd {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+
+table.indextable tr.pcap {
+    height: 10px;
+}
+
+table.indextable tr.cap {
+    margin-top: 10px;
+    background-color: #f2f2f2;
+}
+
+img.toggler {
+    margin-right: 3px;
+    margin-top: 3px;
+    cursor: pointer;
+}
+
+div.modindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+div.genindex-jumpbox {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    margin: 1em 0 1em 0;
+    padding: 0.4em;
+}
+
+/* -- general body styles --------------------------------------------------- */
+
+a.headerlink {
+    visibility: hidden;
+}
+
+h1:hover > a.headerlink,
+h2:hover > a.headerlink,
+h3:hover > a.headerlink,
+h4:hover > a.headerlink,
+h5:hover > a.headerlink,
+h6:hover > a.headerlink,

bonnie-0.3.0.tar.gz/docs/_static/images Added

bonnie-0.3.0.tar.gz/docs/_static/images/bonnie_jobs_done-pinpoint=1417359241,1417411037.png Added

bonnie-0.3.0.tar.gz/docs/_static/images/bonnie_jobs_pending-pinpoint=1417359574,1417411771.png Added

bonnie-0.3.0.tar.gz/docs/about Added

bonnie-0.3.0.tar.gz/docs/about/archival.rst Added

bonnie-0.3.0.tar.gz/docs/about/backup-and-restore.rst Added

bonnie-0.3.0.tar.gz/docs/about/data-loss-prevention.rst Added

bonnie-0.3.0.tar.gz/docs/about/e-discovery.rst Added

bonnie-0.3.0.tar.gz/docs/architecture-and-design.rst Added

@@ -0,0 +1,1860 @@
+:tocdepth: 2
+
+.. _architecture-and-design:
+
+=======================
+Architecture and Design
+=======================
+
+Bonnie receives and parses :term:`event notifications` issued by Cyrus
+IMAP 2.5.
+
+An event notification is issued when a user logs on or off, and when a
+user makes a change to a mailbox or message.
+
+These event notifications are used to build the data sets for each of
+the following features included with Bonnie;
+
+    *   :ref:`about-archival`
+
+    *   :ref:`about-backup-and-restore`
+
+    *   :ref:`about-e-discovery`
+
+    *   :ref:`about-data-loss-prevention`
+
+These features are (each of them) optional, in that a deployment used
+solely for e-Discovery does not imply the inclusion of the other
+features, and most feature descriptions use super-nomenclature for
+otherwise limited, self-contained facilities that tend to serve a more
+narrow purpose.
+
+One example is a ``changelog`` module, which can be used to preserve
+selected subsets of data, such as "who changed what in an event". This
+particular module would fall under the category of e-Discovery, but not
+include the full feature-set of e-Discovery.
+
+.. rubric:: Technology Base
+
+The initial design of Bonnie is created with the following technologies
+as the basis:
+
+    *   Elasticsearch
+    *   ZeroMQ
+
+The functional components that make up a complete Bonnie environment are
+designed to be pluggable such that one or more extensions can be used
+for either of the following channels:
+
+**input**
+
+    Used to receive new event notifications, or jobs, to be handled.
+
+**storage**
+
+    Used to store event notifications, queues and/or metadata.
+
+**output**
+
+    The final and persistent record(s) of state.
+
+To parse information in to useful, digestible chunks, Bonnie uses
+so-called *handlers*, that subscribe to event notifications using
+*interests*.
+
+For example, a *Logout* event is only stored to the output channel,
+should a corresponding *Login* event be available. After all, there must
+not be a *Logout* event without a *Login* event also having occurred.
+
+A handler interested in the *Logout* event uses the storage channel to
+determine the corresponding *Login* event is indeed available.
+
+This storage channel may be configured to be an intermediate buffer,
+that holds all *Login* events until after the corresponding *Logout*
+event notification is received, or a timeout occurs, or may be
+configured to be the same channel as the output channel.
+
+Overview of Components
+======================
+
+The Bonnie infrastructure components are an add-on to an existing Cyrus
+IMAP environment, typically as part of a `Kolab Groupware`_ deployment.
+
+More detailed diagrams of communication flows in a standard Kolab
+Groupware environment are available in the
+`Kolab Groupware documentation`_, and are outside of the scope of the
+design documentation for Bonnie. Suffice it to say, that Kolab Groupware
+components communicate with Cyrus IMAP:
+
+.. graphviz::
+
+    digraph {
+            rankdir = LR;
+            splines = true;
+            overlab = prism;
+            fontname = Calibri;
+
+            edge [color=gray50, fontname=Calibri, fontsize=11];
+            node [shape=record, fontname=Calibri, fontsize=11];
+
+            "Kolab Groupware";
+
+            "Cyrus IMAP";
+
+            "Kolab Groupware" -> "Cyrus IMAP" [dir=both];
+
+        }
+
+As Bonnie is added on top of this (existing) infrastructure the design
+overview for the infrastructure becomes:
+
+.. graphviz::
+
+    digraph {
+            rankdir = LR;
+            splines = true;
+            overlab = prism;
+            fontname = Calibri;
+
+            edge [color=gray50, fontname=Calibri, fontsize=11];
+            node [shape=record, fontname=Calibri, fontsize=11];
+
+            "Kolab Groupware" [color=gray50,style=filled];
+
+            subgraph cluster_bonnie {
+                    label = "Bonnie Infrastructure";
+
+                    "Broker";
+
+                    subgraph cluster_imap {
+                            label = "IMAP Server";
+
+                            "Cyrus IMAP" [color=gray50,style=filled];
+
+                            "Collector";
+                            "Dealer";
+                        }
+
+                    "Worker";
+                }
+
+            "Kolab Groupware" -> "Cyrus IMAP" [dir=both];
+
+            "Cyrus IMAP" -> "Dealer";
+
+            "Dealer" -> "Broker";
+
+            "Broker" -> "Worker" [dir=both];
+
+            "Collector" -> "Broker" [dir=both];
+
+            "Worker" -> "Storage" [dir=both];
+
+        }
+
+The **Dealer** Component
+========================
+
+A dealer is a script executed once for each event notification, and is
+used to dispatch the event notification as fast and as efficient as
+possible.
+
+.. graphviz::
+
+    digraph {
+            rankdir = LR;
+            splines = true;
+            overlab = prism;
+            fontname = Calibri;
+
+            edge [color=gray50, fontname=Calibri, fontsize=11];
+            node [shape=record, fontname=Calibri, fontsize=11];
+
+            "Kolab Groupware" [color=gray50,style=filled];
+
+            subgraph cluster_bonnie {
+                    label = "Bonnie Infrastructure";
+
+                    "Broker";
+
+                    subgraph cluster_imap {
+                            label = "IMAP Server";
+
+                            "Cyrus IMAP" [color=gray50,style=filled];
+
+                            "Collector";
+                            "Dealer" [color="green",style=filled];
+                        }
+
+                    "Worker";
+                }
+
+            "Kolab Groupware" -> "Cyrus IMAP" [dir=both];
+
+            "Cyrus IMAP" -> "Dealer";
+
+            "Dealer" -> "Broker";
+
+            "Broker" -> "Worker" [dir=both];
+

bonnie-0.3.0.tar.gz/docs/conf.py Added

@@ -0,0 +1,278 @@
+# -*- coding: utf-8 -*-
+#
+# Bonnie documentation build configuration file, created by
+# sphinx-quickstart on Fri Nov 28 14:43:59 2014.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../../pykolab.git'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = [
+        'sphinx.ext.autodoc',
+        'sphinx.ext.coverage',
+        'sphinx.ext.doctest',
+        'sphinx.ext.extlinks',
+        'sphinx.ext.graphviz',
+        'sphinx.ext.ifconfig',
+        'sphinx.ext.intersphinx',
+        'sphinx.ext.mathjax',
+        'sphinx.ext.todo',
+        'sphinx.ext.viewcode'
+    ]
+
+autodoc_member_order = 'groupwise'
+
+autodoc_default_flags = [
+        'members',
+        'undoc-members',
+        'private-members',
+        #'special-members',
+        'inherited-members',
+        'show-inheritance'
+    ]
+
+todo_include_todos = True
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Bonnie'
+copyright = u'2014, Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>, Thomas Bruederli <bruederli@kolabsys.com>'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '0.2'
+# The full version, including alpha/beta/rc tags.
+release = '0.2.3'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['_build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'sphinxdoc'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further.  For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Bonniedoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',

bonnie-0.3.0.tar.gz/docs/index.rst Added

bonnie-0.3.0.tar.gz/docs/modules.rst Added

bonnie-0.3.0.tar.gz/docs/technical-documentation Added

bonnie-0.3.0.tar.gz/docs/technical-documentation/daemon.rst Added

bonnie-0.3.0.tar.gz/docs/technical-documentation/index.rst Added

bonnie-0.3.0.tar.gz/docs/technical-documentation/worker-handlers.rst Added

bonnie-0.3.0.tar.gz/docs/technical-documentation/worker.rst Added

bonnie-0.2.2.tar.gz/tests/__init__.py -> bonnie-0.3.0.tar.gz/tests/__init__.py Changed

bonnie-0.2.2.tar.gz/tests/functional/__init__.py -> bonnie-0.3.0.tar.gz/tests/functional/__init__.py Changed

bonnie-0.2.2.tar.gz/tests/functional/test_001_login.py -> bonnie-0.3.0.tar.gz/tests/functional/test_001_login.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import json
 import time
 
@@ -54,4 +74,4 @@
 
         self.assertIsInstance(user, dict)
         self.assertEqual(user['user'], login['user'])
-        self.assertEqual(user['cn'], 'John Doe')
\ No newline at end of file
+        self.assertEqual(user['cn'], 'John Doe')

bonnie-0.2.2.tar.gz/tests/functional/test_002_mailboxes.py -> bonnie-0.3.0.tar.gz/tests/functional/test_002_mailboxes.py Changed

bonnie-0.2.2.tar.gz/tests/functional/test_003_messages.py -> bonnie-0.3.0.tar.gz/tests/functional/test_003_messages.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import json
 
 from . import TestBonnieFunctional
@@ -244,4 +264,3 @@
         self.assertTrue(event['headers']['Subject'] in messagetrash['messageHeaders']['36']['Subject'])
         self.assertEqual(len(event['message_id']), 0)
 
-        
\ No newline at end of file

bonnie-0.2.2.tar.gz/tests/functional/test_004_changelog.py -> bonnie-0.3.0.tar.gz/tests/functional/test_004_changelog.py Changed

bonnie-0.2.2.tar.gz/tests/functional/testbase.py -> bonnie-0.3.0.tar.gz/tests/functional/testbase.py Changed

bonnie-0.2.2.tar.gz/tests/unit/__init__.py -> bonnie-0.3.0.tar.gz/tests/unit/__init__.py Changed

bonnie-0.2.2.tar.gz/tests/unit/test_001_utils.py -> bonnie-0.3.0.tar.gz/tests/unit/test_001_utils.py Changed

bonnie-0.2.2.tar.gz/tests/unit/test_002_collector.py -> bonnie-0.3.0.tar.gz/tests/unit/test_002_collector.py Changed

bonnie-0.2.2.tar.gz/tests/unit/test_003_dealer.py -> bonnie-0.3.0.tar.gz/tests/unit/test_003_dealer.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 import json
 import bonnie
@@ -45,4 +65,3 @@
         dealer.run(json.dumps({ 'event':'MessageAppend', 'user':'cyrus-admin' }))
         self.assertEqual(len(BonnieDealerOutput.output_calls), 1)
         self.assertIn('MessageAppend', BonnieDealerOutput.output_calls)
-        
\ No newline at end of file

bonnie-0.2.2.tar.gz/tests/unit/test_004_worker.py -> bonnie-0.3.0.tar.gz/tests/unit/test_004_worker.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import json
 import elasticsearch
 import bonnie
@@ -75,4 +95,3 @@
         }
         folder = storage.notificaton2folder(notification)
         self.assertNotEqual(folder['id'], folder_id)
-        
\ No newline at end of file

bonnie-0.2.2.tar.gz/tests/unit/test_005_persistence.py -> bonnie-0.3.0.tar.gz/tests/unit/test_005_persistence.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 import json
 import bonnie
@@ -97,4 +117,4 @@
         worker_jobs.append(two)
 
         self.assertEqual(worker_jobs[0], done)
-        self.assertEqual(worker_jobs[-1], two)
\ No newline at end of file
+        self.assertEqual(worker_jobs[-1], two)

bonnie-0.2.2.tar.gz/tests/unit/test_006_caching.py -> bonnie-0.3.0.tar.gz/tests/unit/test_006_caching.py Changed

@@ -1,3 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
+# Thomas Bruederli (Kolab Systems) <bruederli a kolabsys.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import time
 
 from twisted.trial import unittest
@@ -48,4 +68,3 @@
         # expunge internal cache
         d.expunge()
         self.assertEqual(len(d.data), 0)
-        
\ No newline at end of file

bonnie-0.2.2.tar.gz/worker.py -> bonnie-0.3.0.tar.gz/worker.py Changed

Changes of Revision 38