Merge branch 'develop' into feat/rclone-storage-commands

SwissDataScienceCenter · Nov 13, 2023 · 322277e · 322277e
2 parents 3675827 + 4726f66
commit 322277e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019-2023 - Swiss Data Science Center
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/renku/core/session/session.py b/renku/core/session/session.py
@@ -242,10 +242,16 @@ def stop_sessions(session_provider: ISessionProvider) -> SessionStopStatus:
             return session_provider.session_stop(
                 project_name=project_name, session_name=session_name, stop_all=stop_all
             )
-        except errors.RenkulabSessionGetUrlError:
+        except errors.RenkulabSessionGetUrlError as e:
             if provider:
                 raise
-            return SessionStopStatus.FAILED
+            communication.warn(f"Didn't stop any renkulab sessions: {e}")
+            return SessionStopStatus.SUCCESSFUL
+        except errors.DockerError as e:
+            if provider:
+                raise
+            communication.warn(f"Didn't stop any docker sessions: {e}")
+            return SessionStopStatus.SUCCESSFUL
 
     session_detail = "all sessions" if stop_all else f"session {session_name}" if session_name else "session"
     project_name = get_renku_project_name()