Update UI (#1280)

* Upgrade UI

* Rename dashboard to workers

* Don't send html on API errors

* Add download badges

* Improve control groups

* Delete old bootstrap images

* Update github actions version

* Fix formatting

* Remove 3.6 from build

* Update badges

.github/workflows/build.yml

@@ -8,18 +8,18 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
         celery-version: [5.0]
         tornado-version: [5.0, 5.1, 6.0]
         exclude:
           - celery-version: 5.0
             python-version: 3.9
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
 

README.rst

@@ -1,15 +1,17 @@
 Flower
 ======
 
+.. image:: https://img.shields.io/pypi/dm/flower.svg
+    :target: https://pypi.org/project/flower
+    :alt: PyPI - Downloads
+.. image:: https://img.shields.io/docker/pulls/mher/flower.svg
+    :target: https://hub.docker.com/r/mher/flower
+    :alt: Docker Pulls
 .. image:: https://github.com/mher/flower/workflows/Build/badge.svg
     :target: https://github.com/mher/flower/actions
-
 .. image:: https://img.shields.io/pypi/v/flower.svg
     :target: https://pypi.python.org/pypi/flower
 
-.. image:: https://travis-ci.org/mher/flower.svg?branch=master
-        :target: https://travis-ci.org/mher/flower
-
 Flower is a web based tool for monitoring and administrating Celery clusters.
 
 Features

docs/config.rst

@@ -74,7 +74,7 @@ For more info see :ref:`authentication`.
 auto_refresh
 ~~~~~~~~~~~~
 
-Refresh dashboards automatically (by default, `auto_refresh=True`)
+Refresh workers automatically (by default, `auto_refresh=True`)
 
 .. _basic_auth:
 

docs/man.rst

@@ -48,7 +48,7 @@ OPTIONS
   --address                        run on the given address
   --auth                           regexp  of emails to grant access
   --auth_provider                  sets authentication provider class
-  --auto_refresh                   refresh dashboard automatically (default *True*)
+  --auto_refresh                   refresh workers automatically (default *True*)
   --basic_auth                     colon separated user-password to enable
                                    basic auth
   --broker_api                     inspect broker e.g.
@@ -74,7 +74,7 @@ OPTIONS
   --persistent                     enable persistent mode (default *False*)
   --port                           run on the given port (default *5555*)
   --purge_offline_workers          time (in seconds) after which offline workers are purged
-                                   from dashboard
+                                   from workers
   --state_save_interval            state save interval (in milliseconds) (default *0*)
   --tasks_columns                  slugs of columns on /tasks/ page, delimited by comma
                                    (default *name,uuid,state,args,kwargs,result,received,started,runtime,worker*)

flower/__init__.py

@@ -1,2 +1,2 @@
-VERSION = (1, 0, 1)
+VERSION = (2, 0, 0)
 __version__ = '.'.join(map(str, VERSION)) + '-dev'

flower/api/__init__.py

@@ -5,3 +5,11 @@ class BaseApiHandler(BaseHandler):
     def prepare(self):
         if self.application.options.basic_auth or self.application.options.auth:
             raise tornado.web.HTTPError(405, "api is not available when auth is enabled")
+
+    def write_error(self, status_code, **kwargs):
+        exc_info = kwargs.get('exc_info')
+        log_message = exc_info[1].log_message
+        if log_message:
+            self.write(log_message)
+        self.set_status(status_code)
+        self.finish()

flower/options.py

@@ -50,9 +50,9 @@
 define("xheaders", type=bool, default=False,
        help="enable support for the 'X-Real-Ip' and 'X-Scheme' headers.")
 define("auto_refresh", default=True,
-       help="refresh dashboards", type=bool)
+       help="refresh workerss", type=bool)
 define("purge_offline_workers", default=None, type=int,
-       help="time (in seconds) after which offline workers are purged from dashboard")
+       help="time (in seconds) after which offline workers are purged from workers")
 define("cookie_secret", type=str, default=token_urlsafe(64),
        help="secure cookie secret")
 define("conf", default=DEFAULT_CONFIG_FILE,