File salt-event-processor.patch of Package uyuni-salt-event-processor

diff --git a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
index 6113192f5ab..93bfff32c3e 100644
--- a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
+++ b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
@@ -135,8 +135,8 @@ public class RhnServletListener implements ServletContextListener {
         // the following is not safe to run in the testsuite
         // and will be excluded from test runs
         if (sce != null) {
-            saltReactor.start();
-            logStart("Salt reactor");
+            //saltReactor.start();
+            //logStart("Salt reactor");
         }
 
         LOG.debug("Starting upgrade check");
diff --git a/java/code/src/com/suse/manager/reactor/PGEventStream.java b/java/code/src/com/suse/manager/reactor/PGEventStream.java
index 08eb1bceb28..de17262d6a0 100644
--- a/java/code/src/com/suse/manager/reactor/PGEventStream.java
+++ b/java/code/src/com/suse/manager/reactor/PGEventStream.java
@@ -102,6 +102,7 @@ public class PGEventStream extends AbstractEventStream implements PGNotification
             int pending = SaltEventFactory.fixQueueNumbers(THREAD_POOL_SIZE);
             if (pending > 0) {
                 LOG.info("Found {} queued salt events", pending);
+                HibernateFactory.commitTransaction();
             }
 
             connection = (PGConnection) dataSource.getConnection();
diff --git a/java/code/src/com/suse/saltevent/SaltEventProcessor.java b/java/code/src/com/suse/saltevent/SaltEventProcessor.java
new file mode 100644
index 00000000000..ffeb77148fb
--- /dev/null
+++ b/java/code/src/com/suse/saltevent/SaltEventProcessor.java
@@ -0,0 +1,29 @@
+package com.suse.saltevent;
+
+import com.redhat.rhn.GlobalInstanceHolder;
+
+import com.suse.manager.reactor.SaltReactor;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class SaltEventProcessor {
+
+    private static final Logger LOG = LogManager.getLogger(SaltEventProcessor.class);
+
+
+    public static void main(String[] argv) {
+        SaltReactor saltReactor = new SaltReactor(
+                GlobalInstanceHolder.SALT_API,
+                GlobalInstanceHolder.SYSTEM_QUERY,
+                GlobalInstanceHolder.SALT_SERVER_ACTION_SERVICE,
+                GlobalInstanceHolder.SALT_UTILS,
+                GlobalInstanceHolder.PAYG_MANAGER,
+                GlobalInstanceHolder.ATTESTATION_MANAGER);
+
+        saltReactor.start();
+//        if (LOG.isDebugEnabled()) {
+        LOG.error("Salt reactor started");
+//        }
+    }
+}
diff --git a/containers/server-salt-event-processor-image/saltEventProcessor.conf b/containers/server-salt-event-processor-image/saltEventProcessor.conf
new file mode 100644
index 00000000000..5311c8e2079
--- /dev/null
+++ b/containers/server-salt-event-processor-image/saltEventProcessor.conf
@@ -0,0 +1,13 @@
+#********************************************************************
+# Salt Event Processor Properties
+#********************************************************************
+# Java Application
+
+SALTEN_LIBRARY_PATH="/usr/lib:/usr/lib64"
+SALTEN_RHN_CLASSPATH="/usr/share/rhn/classes"
+SALTEN_RHN_JARS="/usr/share/rhn/lib/spacewalk-asm.jar:/usr/share/rhn/lib/rhn.jar:/usr/share/rhn/lib/java-branding.jar"
+SALTEN_JARS="/usr/share/spacewalk/taskomatic/*"
+SALTEN_JAVA_OPTS=""
+SALTEN_INIT_MEMORY=128
+SALTEN_MAX_MEMORY=512
+JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=*:8006,server=y,suspend=n "
\ No newline at end of file
diff --git a/containers/server-salt-event-processor-image/mrg_salt_event_processor.sh b/containers/server-salt-event-processor-image/mrg_salt_event_processor.sh
new file mode 100644
index 00000000000..ac51a27f838
--- /dev/null
+++ b/containers/server-salt-event-processor-image/mrg_salt_event_processor.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+# SaltEventProcessorDaemon start script
+. /etc/rhn/saltEventProcessor.conf
+
+SALTEN_PARAMS="-Dibm.dst.compatibility=true -Dfile.encoding=UTF-8 -Xms${SALTEN_INIT_MEMORY}m -Xmx${SALTEN_MAX_MEMORY}m ${SALTEN_CRASH_PARAMS} ${SALTEN_JAVA_OPTS}"
+SALTEN_CLASSPATH="${SALTEN_RHN_CLASSPATH}:${SALTEN_RHN_JARS}:${SALTEN_JARS}"
+
+# options sourced from /usr/share/rhn/config-defaults/rhn_saltEventProcessor_daemon.conf (do not touch). Add additional options to /etc/rhn/saltEventProcessor.conf
+/usr/bin/java -Djava.library.path=${SALTEN_LIBRARY_PATH} -classpath ${SALTEN_CLASSPATH} ${SALTEN_PARAMS} ${JAVA_OPTS} ${JAVA_AGENT} com.suse.saltevent.SaltEventProcessor