Kolab Groupware OBS

bonnie-0.1.1.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py -> bonnie-0.1.2.tar.gz/bonnie/broker/brokers/zmq_broker/__init__.py Changed

bonnie-0.1.1.tar.gz/bonnie/dealer/__init__.py -> bonnie-0.1.2.tar.gz/bonnie/dealer/__init__.py Changed

@@ -44,12 +44,26 @@
         user = parsed['user'] if parsed.has_key('user') else None
 
         # ignore globally excluded events
-        exclude_events = conf.get('dealer', 'input_exclude_events', '').split(',')
+        exclude_events = conf.get('dealer', 'input_exclude_events', None)
+        if not exclude_events == None:
+            exclude_events = exclude_events.split(',')
+        else:
+            exclude_events = []
+
         if event in exclude_events:
             return False
 
-        blacklist_events = conf.get('dealer', 'blacklist_events', '').split(',')
-        blacklist_users  = conf.get('dealer', 'blacklist_users', '').split(',')
+        blacklist_events = conf.get('dealer', 'blacklist_events', None)
+        if not blacklist_events == None:
+            blacklist_events = blacklist_events.split(',')
+        else:
+            blacklist_events = []
+
+        blacklist_users  = conf.get('dealer', 'blacklist_users', None)
+        if not blacklist_users == None:
+            blacklist_users = blacklist_users.split(',')
+        else:
+            blacklist_users = []
 
         # ignore blacklisted events for blacklisted users
         if event in blacklist_events and user is not None and user in blacklist_users:

bonnie-0.1.1.tar.gz/bonnie/dealer/outputs/__init__.py -> bonnie-0.1.2.tar.gz/bonnie/dealer/outputs/__init__.py Changed

bonnie-0.1.2.tar.gz/bonnie/dealer/outputs/file_output.py Added

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2010-2014 Kolab Systems AG (http://www.kolabsys.com)
+#
+# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen 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; version 3 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.
+#
+# 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.
+#
+
+import os
+import socket
+
+import bonnie
+conf = bonnie.getConf()
+log = bonnie.getLogger('bonnie.dealer.FileOutput')
+
+class FileOutput(object):
+    def __init__(self, *args, **kw):
+        self.file_output = conf.get("dealer", "file_path")
+
+    def name(self):
+        return 'file_output'
+
+    def register(self, *args, **kw):
+        return self.run
+
+    def run(self, notification):
+        log.debug("Notification received: %r" % (notification), level=9)
+        if self.file_output == None:
+            return notification
+
+        fp = open(self.file_output, 'a')
+        fp.write("%r\n" % (notification))
+        fp.close()

bonnie-0.1.1.tar.gz/bonnie/dealer/outputs/zmq_output.py -> bonnie-0.1.2.tar.gz/bonnie/dealer/outputs/zmq_output.py Changed

bonnie-0.1.1.tar.gz/bonnie/worker/__init__.py -> bonnie-0.1.2.tar.gz/bonnie/worker/__init__.py Changed

bonnie-0.1.1.tar.gz/bonnie/worker/outputs/elasticsearch_output.py -> bonnie-0.1.2.tar.gz/bonnie/worker/outputs/elasticsearch_output.py Changed

bonnie-0.1.1.tar.gz/contrib/bonnie-collector.sysvinit -> bonnie-0.1.2.tar.gz/contrib/bonnie-collector.sysvinit Changed

@@ -1,19 +1,19 @@
 #! /bin/bash
 #
-# bonnie-broker  Start/Stop the Bonnie Broker daemon
+# bonnie-collector  Start/Stop the Bonnie Broker daemon
 #
 # chkconfig:        - 65 10
-# description:      The Bonnie Broker daemon is a message broker.
-# processname: bonnie-broker
+# description:      The Bonnie Broker daemon is a message collector.
+# processname: bonnie-collector
 
 ### BEGIN INIT INFO
-# Provides: bonnie-brokerd
+# Provides: bonnie-collectord
 # Default-Start: -
 # Default-Stop: 0 1 2 6
 # Required-Start: $remote_fs $local_fs $network
 # Required-Stop: $remote_fs $local_fs $network
 # Short-Description: Start/Stop the Bonnie Broker daemon
-# Description:      The Bonnie Broker daemon is a message broker.
+# Description:      The Bonnie Broker daemon is a message collector.
 ### END INIT INFO
 
 # Source function library.
@@ -26,22 +26,22 @@
 USER="bonnie"
 GROUP="bonnie"
 
-if [ -f /etc/sysconfig/bonnie-broker ] ; then
-    . /etc/sysconfig/bonnie-broker
+if [ -f /etc/sysconfig/bonnie-collector ] ; then
+    . /etc/sysconfig/bonnie-collector
 fi
 
-if [ -f /etc/default/bonnie-broker ]; then
-    . /etc/default/bonnie-broker
+if [ -f /etc/default/bonnie-collector ]; then
+    . /etc/default/bonnie-collector
 fi
 
 RETVAL=0
 
 # Set up some common variables before we launch into what might be
 # considered boilerplate by now.
-prog=bonnie-broker
-path=/usr/sbin/bonnie-broker
+prog=bonnie-collector
+path=/usr/sbin/bonnie-collector
 lockfile=/var/lock/subsys/$prog
-pidfile=/var/run/bonnie/bonnie-broker.pid
+pidfile=/var/run/bonnie/bonnie-collector.pid
 
 [ ! -d "$(dirname ${pidfile})" ] && mkdir -p $(dirname ${pidfile})
 chown ${USER}:${GROUP} $(dirname ${pidfile})

Changes of Revision 28