manager: Remove old message queue processing

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 4040e9301dc50639bc98f29ad58f6fd30b8e70aa..5f3710fe7262c03ee4288c178eb05a5aa6f269f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,7 +112,6 @@ manager_PYTHON = \
        src/manager/base.py \
        src/manager/bugs.py \
        src/manager/builds.py \
-       src/manager/messages.py \
        src/manager/repositories.py \
        src/manager/sessions.py \
        src/manager/sources.py \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8eb1a41d652a7385c0e869fa14dc2ae533c850e2..ffdae3f92dc51f52bb0c90e906e958f00e87a43e 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -165,7 +165,6 @@ src/manager/base.py
 src/manager/bugs.py
 src/manager/builds.py
 src/manager/__init__.py
-src/manager/messages.py
 src/manager/repositories.py
 src/manager/sessions.py
 src/manager/sources.py

diff --git a/src/manager/__init__.py b/src/manager/__init__.py
index 4453a094ca5836f5d3abc1986221d9210dd8ca5f..b70bfb4b3773d78bb8fec6e469cce0b6a8aac785 100644 (file)
--- a/src/manager/__init__.py
+++ b/src/manager/__init__.py
@@ -5,7 +5,6 @@ from . import base
 from .bugs         import BugsUpdateEvent
 from .builds       import BuildsFailedRestartEvent, CheckBuildDependenciesEvent
 from .builds       import CreateTestBuildsEvent, DistEvent
-from .messages     import MessagesSendEvent
 from .repositories import RepositoriesUpdateEvent
 from .sessions     import SessionsCleanupEvent
 from .sources      import SourcesPullEvent

diff --git a/src/manager/messages.py b/src/manager/messages.py
deleted file mode 100644 (file)
index 4113914..0000000
--- a/src/manager/messages.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/python
-
-from . import base
-
-class MessagesSendEvent(base.Event):
-       # Emails should be sent out as quickly as possible.
-       priority = 0
-
-       @property
-       def interval(self):
-               return self.pakfire.settings.get_int("messages_interval", 10)
-
-       def run(self):
-               for msg in self.pakfire.messages.get_all():
-                       try:
-                               self.pakfire.messages.send_msg(msg)
-
-                       except:
-                               continue
-
-                       # If everything was okay, we can delete the message in the database.
-                       self.pakfire.messages.delete(msg.id)

diff --git a/src/scripts/pakfire-manager b/src/scripts/pakfire-manager
index d620253e2ba76067978e8323410c21c568aec96a..0aff75fe397aa42acec9e4b2af6505470ea2a363 100644 (file)
--- a/src/scripts/pakfire-manager
+++ b/src/scripts/pakfire-manager
@@ -22,7 +22,6 @@ events = (
        pakfire.buildservice.manager.CleanupFilesEvent,
        pakfire.buildservice.manager.CreateTestBuildsEvent,
        pakfire.buildservice.manager.DistEvent,
-       pakfire.buildservice.manager.MessagesSendEvent,
        pakfire.buildservice.manager.RepositoriesUpdateEvent,
        pakfire.buildservice.manager.SessionsCleanupEvent,
        pakfire.buildservice.manager.SourcesPullEvent,