Merge branch 'cpulimit_fix' into 'master'

cpulimit fix See merge request !219

Merge branch 'cpulimit_fix' into 'master'
67ca8af8 · Philip ABBET · a222a196 · c90f18d1 · 67ca8af8 · a222a196
Commit 67ca8af8 authored 8 years ago by Philip ABBET
--- a/beat/web/backend/views.py
+++ b/beat/web/backend/views.py
@@ -56,7 +56,6 @@ from . import schedule
 class Work:
    '''Helper to do the required worker job for local scheduling'''
-    cpulimit = None
    process = None
    environments = None
    worker = None
@@ -91,7 +90,7 @@ class Work:
        if Work.worker is None: self.__setup__()
        # Regular work
-        Work.worker.work(Work.environments, Work.cpulimit, Work.process)
+        Work.worker.work(Work.environments, Work.process)
 #------------------------------------------------

--- a/beat/web/static/pages/502.html
+++ b/beat/web/static/pages/502.html
-<!DOCTYPE html>
-<!--
-  Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
-  Contact: beat.support@idiap.ch
-  This file is part of the beat.web module of the BEAT platform.
-  Commercial License Usage
-  Licensees holding valid commercial BEAT licenses may use this file in
-  accordance with the terms contained in a written agreement between you
-  and Idiap. For further information contact tto@idiap.ch
-  Alternatively, this file may be used under the terms of the GNU Affero
-  Public License version 3 as published by the Free Software and appearing
-  in the file LICENSE.AGPL included in the packaging of this file.
-  The BEAT platform 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.
-  You should have received a copy of the GNU Affero Public License along
-  with the BEAT platform. If not, see http://www.gnu.org/licenses/.
-->
-<html>
-  <body>
-    <h1>Platform under Maintenance - Bad Gateway (502)</h1>
-    <p>The BEAT Platform is currently under maintenance. Please keep posted to
-    <a href="https://groups.google.com/forum/#!forum/beat-devel">our mailing
-      list at Google Groups</a> for updated information.</p>
-  </body>
-</html>