Merge branch 'develop' into 'master'

Fix schedulers email notifications See merge request ADAS-Private/HEAppE/heappe-core!80
It4innovations · Sep 7, 2022 · c9d7b89 · c9d7b89
2 parents 371074a + 6f782fa
commit c9d7b89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...onnectionFramework/SchedulerAdapters/PbsPro/Generic/ConversionAdapter/PbsProJobAdapter.cs b/...onnectionFramework/SchedulerAdapters/PbsPro/Generic/ConversionAdapter/PbsProJobAdapter.cs
@@ -58,8 +58,8 @@ public void SetTasks(IEnumerable<object> tasksAllocationcmd)
         /// <param name="notifyOnFailure">Notification on failured job</param>
         public void SetNotifications(string mailAddress, bool? notifyOnStart, bool? notifyOnCompletion, bool? notifyOnFailure)
         {
-            if (!string.IsNullOrEmpty(mailAddress) && (notifyOnStart ?? false)
-                    || (notifyOnCompletion ?? false) || (notifyOnFailure ?? false))
+            if (!string.IsNullOrEmpty(mailAddress) && ((notifyOnStart ?? false)
+                               || (notifyOnCompletion ?? false) || (notifyOnFailure ?? false)))
             {
                 var onFailureValue = (notifyOnFailure ?? false ? "a" : string.Empty);
                 var onStartValue = (notifyOnStart ?? false ? "b" : string.Empty);

diff --git a/HpcConnectionFramework/SchedulerAdapters/Slurm/Generic/ConversionAdapter/SlurmJobAdapter.cs b/HpcConnectionFramework/SchedulerAdapters/Slurm/Generic/ConversionAdapter/SlurmJobAdapter.cs
@@ -58,8 +58,8 @@ public void SetTasks(IEnumerable<object> tasksAllocationcmd)
         /// <param name="notifyOnFailure">Notification on failured job</param>
         public void SetNotifications(string mailAddress, bool? notifyOnStart, bool? notifyOnCompletion, bool? notifyOnFailure)
         {
-            if (!string.IsNullOrEmpty(mailAddress) && (notifyOnStart ?? false)
-                        || (notifyOnCompletion ?? false) || (notifyOnFailure ?? false))
+            if (!string.IsNullOrEmpty(mailAddress) && ((notifyOnStart ?? false)
+                               || (notifyOnCompletion ?? false) || (notifyOnFailure ?? false)))
             {
                 string mailParameters = string.Empty;
                 if (notifyOnFailure ?? false)

diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Major changes in the latest release includes
 - various functional and security updates
 
 ## Documentation
-Please see the official HEAppE documentation at https://heappe.eu/docs.
+Please see the official HEAppE documentation at https://heappe.it4i.cz/docs.
 
 # References