Merge 2d605a3 into 2dae97e

RasaHQ · Oct 5, 2018 · 6b9c211 · 6b9c211
2 parents 2dae97e + 2d605a3
commit 6b9c211
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -20,6 +20,10 @@ Removed
 
 Fixed
 -----
+- ``rasa_nlu.server`` allowed more than ``max_training_processes``
+  to be trained if they belong to different projects.
+  ``max_training_processes`` is now a global parameter, regardless of what
+  project the training process belongs to.
 
 [0.13.6] - 2018-10-04
 ^^^^^^^^^^^^^^^^^^^^^

diff --git a/rasa_nlu/data_router.py b/rasa_nlu/data_router.py
@@ -328,11 +328,11 @@ def start_train_process(self,
         if not project:
             raise InvalidProjectError("Missing project name to train")
 
+        if self._training_processes <= self._current_training_processes:
+            raise MaxTrainingError
+
         if project in self.project_store:
-            if self._training_processes <= self._current_training_processes:
-                raise MaxTrainingError
-            else:
-                self.project_store[project].status = 1
+            self.project_store[project].status = 1
         elif project not in self.project_store:
             self.project_store[project] = Project(
                     self.component_builder, project,