Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory-orchestrator
Commits
f44b078d
Verified
Commit
f44b078d
authored
8 months ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Fixes webService call namespace
parent
74ab166d
dev
61-orchestrator-lifecycle-array-supann-is-analyzed-with-static-numbering
63-orchestrator-mail-controller-format-of-mail-text-and-signature-are-not-utf8-usage-of-accents-is
70-create-unitests-for-orchestrator
73-orchestrator-create-a-librabry-in-core-orchestrator
78-redesign-audit-class
79-redesign-mail
80-redesign-notifications-class
81-redesign-reminders-class
82-redesign-lifecycle-class
89-orchestrator-lifecycle-adaptation-to-regex-supann-selection
main
revert-55863b23
1.1
2 merge requests
!72
Releasing Fusiondirectory Orchestrator 1.1
,
!57
Resolve "[Orchestrator] - Failing to activate cyclic tasks"
Pipeline
#29251
failed with stages
in 1 minute and 33 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
library/TaskGateway.php
+7
-4
library/TaskGateway.php
with
7 additions
and
4 deletions
+7
-4
library/TaskGateway.php
+
7
−
4
View file @
f44b078d
...
@@ -145,8 +145,9 @@ class TaskGateway
...
@@ -145,8 +145,9 @@ class TaskGateway
$this
->
unsetCountKeys
(
$tasks
);
$this
->
unsetCountKeys
(
$tasks
);
if
(
!
empty
(
$tasks
))
{
if
(
!
empty
(
$tasks
))
{
// Initiate the object webservice.
// Initiate the object webservice.
$webservice
=
new
WebServiceCall
(
$_ENV
[
'FUSION_DIRECTORY_API_URL'
]
.
'/login'
,
'POST'
);
$webservice
=
new
FusionDirectory\Rest\
WebServiceCall
(
$_ENV
[
'FUSION_DIRECTORY_API_URL'
]
.
'/login'
,
'POST'
);
// Required to prepare future webservice call. E.g. Retrieval of mandatory token.
// Required to prepare future webservice call. E.g. Retrieval of mandatory token.
$webservice
->
setCurlSettings
();
$webservice
->
setCurlSettings
();
...
@@ -186,21 +187,23 @@ class TaskGateway
...
@@ -186,21 +187,23 @@ class TaskGateway
}
}
break
;
break
;
case
'Weekly'
:
case
'Weekly'
:
if
(
$interval
->
d
>=
7
)
{
if
(
$interval
->
d
ays
>=
7
)
{
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
}
else
{
}
else
{
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
}
}
break
;
break
;
case
'Daily'
:
case
'Daily'
:
if
(
$interval
->
d
>=
1
)
{
if
(
$interval
->
d
ays
>=
1
)
{
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
}
else
{
}
else
{
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
}
}
break
;
break
;
case
'Hourly'
:
case
'Hourly'
:
if
(
$interval
->
h
>=
1
)
{
// When checking for hourly schedules, consider both the days and hours
$totalHours
=
$interval
->
days
*
24
+
$interval
->
h
;
if
(
$totalHours
>=
1
)
{
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
$result
[
$task
[
'dn'
]][
'result'
]
=
$webservice
->
activateCyclicTasks
(
$task
[
'dn'
]);
}
else
{
}
else
{
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
$result
[
$task
[
'dn'
]][
'lastExecFailed'
]
=
'This cyclic task has yet to reached its next execution cycle.'
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets