Merge pull request #124 from CSCfi/devel

bump to 1.0.0rc15

Author: blankdots

Dockerfile

@@ -16,11 +16,11 @@ RUN cd /root/swift_ui/swift_browser_ui_frontend \
     && npm install \
     && npm run build
 
-FROM python:3.8-alpine3.12 as BACKEND
+FROM python:3.8-alpine3.13 as BACKEND
 
 RUN apk add --update \
-    && apk add --no-cache build-base curl-dev linux-headers bash git\
-    && apk add --no-cache libressl-dev libffi-dev\
+    && apk add --no-cache build-base curl-dev linux-headers bash git \
+    && apk add --no-cache libressl-dev libffi-dev rust cargo \
     && rm -rf /var/cache/apk/*
 
 COPY requirements.txt /root/swift_ui/requirements.txt
@@ -32,7 +32,7 @@ RUN pip install --upgrade pip && \
     pip install -r /root/swift_ui/requirements.txt && \
     pip install /root/swift_ui
 
-FROM python:3.8-alpine3.12
+FROM python:3.8-alpine3.13
 
 RUN apk add --no-cache --update bash
 

docs/source/conf.py

@@ -28,7 +28,7 @@
 author = 'CSC Developers'
 
 # The full version, including alpha/beta/rc tags
-version = release = '1.0.0rc14'
+version = release = '1.0.0rc15'
 
 
 # -- General configuration ---------------------------------------------------

swift_browser_ui/__init__.py

@@ -7,6 +7,6 @@
 
 
 __name__ = "swift_browser_ui"
-__version__ = "1.0.0rc14"
+__version__ = "1.0.0rc15"
 __author__ = "CSC Developers"
 __license__ = "MIT License"

swift_browser_ui/health.py

@@ -11,6 +11,17 @@
 from .signature import sign
 
 
+def _set_error_status(
+    request: aiohttp.web.Request,
+    services: typing.Dict[str, typing.Any],
+    service: str,
+) -> None:
+    request.app["Log"].debug(f"Poll {service} failed")
+    services[service] = {
+        "status": "Error"
+    }
+
+
 async def get_x_account_sharing(
         services: typing.Dict[str, typing.Any],
         request: aiohttp.web.Request,
@@ -42,10 +53,10 @@ async def get_x_account_sharing(
                 "status": "Nonexistent"
             }
     except ServerDisconnectedError:
-        request.app["Log"].debug("Poll swift-x-account-sharing failed")
-        services["swift-x-account-sharing"] = {
-            "status": "Error"
-        }
+        _set_error_status(request, services, "swift-x-account-sharing")
+    except Exception as e:
+        request.app["Log"].info(f"Health failed for reason: {e}")
+        _set_error_status(request, services, "swift-x-account-sharing")
 
 
 async def get_swift_sharing(
@@ -79,10 +90,10 @@ async def get_swift_sharing(
                 "status": "Nonexistent"
             }
     except ServerDisconnectedError:
-        request.app["Log"].debug("Poll swift-x-account-sharing failed")
-        services["swift-sharing-request"] = {
-            "status": "Error"
-        }
+        _set_error_status(request, services, "swift-sharing-request")
+    except Exception as e:
+        request.app["Log"].info(f"Health failed for reason: {e}")
+        _set_error_status(request, services, "swift-sharing-request")
 
 
 async def get_upload_runner(
@@ -116,10 +127,10 @@ async def get_upload_runner(
                 "status": "Nonexistent"
             }
     except ServerDisconnectedError:
-        request.app["Log"].debug("Poll swift-x-account-sharing failed")
-        services["swiftui-upload-runner"] = {
-            "status": "Error"
-        }
+        _set_error_status(request, services, "swiftui-upload-runner")
+    except Exception as e:
+        request.app["Log"].info(f"Health failed for reason: {e}")
+        _set_error_status(request, services, "sswiftui-upload-runner")
 
 
 async def handle_health_check(

swift_browser_ui_frontend/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "swift_browser_ui_frontend_npm",
-  "version": "1.0.0rc14",
+  "version": "1.0.0rc15",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",