Merge pull request #791 from wagnert/1.0

Fixed #790 - Long running messages in Message Queue blocks other messages

CHANGELOG.md

@@ -3,9 +3,11 @@
 ## Bugfixes
 
 * Fixed [#784](https://github.com/appserver-io/appserver/issues/784) - Application Deployment after switching to safe user
+* Fixed [#790](https://github.com/appserver-io/appserver/issues/790) - Long running messages in Message Queue blocks other messages
 
 ## Features
 
+* Remove [#777](https://github.com/appserver-io/appserver/issues/777) - Remove remote http://www.w3.org/2001/03/xml.xsd from schemas and configurations
 * Closed [#758](https://github.com/appserver-io/appserver/issues/758) - Update to latest PHP 5.5.24
 
 # Version 1.0.4

UPGRADE-1.0.5.md

@@ -0,0 +1,3 @@
+# Upgrade from 1.0.4 to 1.0.5
+
+Updating from 1.0.4 to 1.0.5 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.0.4.

resources/schema/appserver.xsd

@@ -4,7 +4,7 @@
            targetNamespace="http://www.appserver.io/appserver"
            elementFormDefault="unqualified"
            attributeFormDefault="unqualified">
-    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+    <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
 
     <xs:complexType name="simpleElement">
         <xs:simpleContent>

resources/schema/xml.xsd

@@ -0,0 +1,117 @@
+<?xml version='1.0'?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+
+    This schema document describes the XML namespace, in a form
+    suitable for import by other schema documents.  
+
+    Note that local names in this namespace are intended to be defined
+    only by the World Wide Web Consortium or its subgroups.  The
+    following names are currently defined in this namespace and should
+    not be used with conflicting semantics by any Working Group,
+    specification, or document instance:
+
+    base (as an attribute name): denotes an attribute whose value
+         provides a URI to be used as the base for interpreting any
+         relative URIs in the scope of the element on which it
+         appears; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML Base specification.
+
+    lang (as an attribute name): denotes an attribute whose value
+         is a language code for the natural language of the content of
+         any element; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML specification.
+
+    space (as an attribute name): denotes an attribute whose
+         value is a keyword indicating what whitespace processing
+         discipline is intended for the content of the element; its
+         value is inherited.  This name is reserved by virtue of its
+         definition in the XML specification.
+
+    Father (in any context at all): denotes Jon Bosak, the chair of 
+         the original XML Working Group.  This name is reserved by 
+         the following decision of the W3C XML Plenary and 
+         XML Coordination groups:
+
+             In appreciation for his vision, leadership and dedication
+             the W3C XML Plenary on this 10th day of February, 2000
+             reserves for Jon Bosak in perpetuity the XML name
+             xml:Father
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang or xml:space attributes
+        on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>

src/AppserverIo/Appserver/MessageQueue/MessageQueue.php

@@ -230,6 +230,29 @@ protected function uniqueWorkerName(PriorityKeyInterface $priorityKey)
         return sprintf('%s-%s', $this->getName(), $priorityKey);
     }
 
+    /**
+     * Does shutdown logic for request handler if something went wrong and
+     * produces a fatal error for example.
+     *
+     * @return void
+     */
+    public function shutdown()
+    {
+
+        // check if there was a fatal error caused shutdown
+        if ($lastError = error_get_last()) {
+            // initialize type + message
+            $type = 0;
+            $message = '';
+            // extract the last error values
+            extract($lastError);
+            // query whether we've a fatal/user error
+            if ($type === E_ERROR || $type === E_USER_ERROR) {
+                $this->getApplication()->getInitialContext()->getSystemLogger()->error($message);
+            }
+        }
+    }
+
     /**
      * We process the messages/jobs here.
      *
@@ -238,6 +261,9 @@ protected function uniqueWorkerName(PriorityKeyInterface $priorityKey)
     public function run()
     {
 
+        // register shutdown handler
+        register_shutdown_function(array(&$this, "shutdown"));
+
         // create a local instance of application and storage
         $application = $this->application;
 
@@ -254,22 +280,15 @@ public function run()
         $messages = $this->messages;
 
         // prepare the storages
-        $jobsExecuting = array();
         $jobsToExceute = array();
-        $messageStates = array();
 
         // initialize the counter for the storages
         $counter = 0;
 
         // create a separate queue for each priority
         foreach (PriorityKeys::getAll() as $priorityKey) {
-            // ATTENTION: We use an array for the jobs (threads) that are executing acutually.
-            //            Using stackables leads to random segfaults on Windows!
-            $jobsExecuting[$counter] = array();
-
             // create the containers for the worker
             $jobsToExceute[$counter] = new GenericStackable();
-            $messageStates[$counter] = new GenericStackable();
 
             // initialize and start the queue worker
             $queueWorker = new QueueWorker();
@@ -278,9 +297,7 @@ public function run()
             $queueWorker->injectApplication($application);
 
             // attach the storages
-            $queueWorker->injectJobsExecuting($jobsExecuting[$counter]);
             $queueWorker->injectJobsToExecute($jobsToExceute[$counter]);
-            $queueWorker->injectMessageStates($messageStates[$counter]);
 
             // start the worker instance
             $queueWorker->start();

src/AppserverIo/Appserver/MessageQueue/MessageQueueValve.php

@@ -59,9 +59,6 @@ public function invoke(HttpServletRequestInterface $servletRequest, HttpServletR
         // unpack the message
         $message = MessageQueueProtocol::unpack($servletRequest->getBodyContent());
 
-        // @todo Not sure if we need that!!!!!!
-        $message->setState(StateActive::get());
-
         // load message queue name and priority key
         $queueName = $message->getDestination()->getName();
         $priorityKey = $message->getPriority();