Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
LOFAR
Manage
Activity
Members
Labels
Plan
Issues
Wiki
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RadioObservatory
LOFAR
Commits
4c77a5bf
Commit
4c77a5bf
authored
3 years ago
by
Jorrit Schaap
Browse files
Options
Downloads
Patches
Plain Diff
TMSS-717
: getSubTasksStartingInThreeMinutes includes subtasks in scheduled and queueing state
parent
0c16e649
No related branches found
No related tags found
1 merge request
!447
TMSS-717: merge commissioning fixes back to master
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
+15
-1
15 additions, 1 deletion
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
with
15 additions
and
1 deletion
MAC/APL/MainCU/src/MACScheduler/TMSSBridge.cc
+
15
−
1
View file @
4c77a5bf
...
...
@@ -87,16 +87,28 @@ Json::Value TMSSBridge::getSubTasksStartingInThreeMinutes()
Json
::
Value
result
;
if
(
httpGETAsJson
(
queryStr
,
result
))
LOG_INFO_STR
(
string
(
"JSON data for "
)
<<
queryStr
<<
std
::
endl
<<
result
.
toStyledString
());
result
=
result
[
"results"
];
LOG_INFO_STR
(
string
(
"JSON data for "
)
<<
queryStr
<<
std
::
endl
<<
result
.
toStyledString
());
// combine scheduled list with queuing list
string
queryStr2
=
"/api/subtask/?state__value=queueing&start_time__gt="
+
to_iso_extended_string
(
lower_limit
)
+
"&start_time__lt="
+
to_iso_extended_string
(
upper_limit
)
+
"&ordering=start_time"
;
Json
::
Value
result2
;
if
(
httpGETAsJson
(
queryStr2
,
result2
))
{
LOG_INFO_STR
(
string
(
"JSON data for "
)
<<
queryStr2
<<
std
::
endl
<<
result2
.
toStyledString
());
result2
=
result2
[
"results"
];
result
=
result
.
append
(
result2
);
LOG_INFO_STR
(
string
(
"JSON data for "
)
<<
queryStr2
<<
std
::
endl
<<
result2
.
toStyledString
());
result
.
append
(
result2
);
}
LOG_INFO_STR
(
string
(
"JSON data total"
)
<<
std
::
endl
<<
result
.
toStyledString
());
return
result
;
return
Json
::
Value
(
""
);
}
...
...
@@ -246,6 +258,8 @@ bool TMSSBridge::httpQuery(const string& target, string &result, const string& q
curl_global_cleanup
();
LOG_INFO_STR
(
string
(
"["
)
<<
query_method
<<
"] code="
<<
httpCode
<<
" "
<<
url
);
LOG_INFO_STR
(
result
);
if
(
httpCode
==
200
)
{
return
true
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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