Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
dcdb
dcdb
Commits
97e618bd
Commit
97e618bd
authored
Jan 18, 2021
by
Carla Guillen
Browse files
Merge branch 'development' of gitlab.lrz.de:dcdb/dcdb into development
parents
b1651267
5e616f21
Changes
2
Hide whitespace changes
Inline
Side-by-side
analytics/operators/smucngperf/SMUCNGPerfOperator.cpp
View file @
97e618bd
...
...
@@ -140,7 +140,7 @@ void SMUCNGPerfOperator::printConfig(LOG_LEVEL ll) {
void
SMUCNGPerfOperator
::
compute
(
U_Ptr
unit
)
{
auto
inputs
=
unit
->
getInputs
();
auto
timestamp
=
getTimestamp
()
-
_go_back_ns
;
auto
timestamp
=
_scheduledTime
-
_go_back_ns
;
for
(
auto
&
outSensor
:
unit
->
getOutputs
()){
if
(
outSensor
->
getMetadata
()
==
nullptr
||
!
outSensor
->
getMetadata
()
->
getScale
())
{
LOG
(
error
)
<<
"No metadata defined, sensor "
<<
outSensor
->
getName
()
<<
" can't compute anything."
;
...
...
common/src/RESTHttpsServer.cpp
View file @
97e618bd
...
...
@@ -89,7 +89,8 @@ RESTHttpsServer::RESTHttpsServer(serverSettings_t settings) :
}
catch
(
const
std
::
exception
&
e
)
{
ServerLOG
(
fatal
)
<<
"Could not load certificate OR private key settings file! "
"Please ensure the paths in the config file are valid!"
;
throw
;
std
::
runtime_error
re
(
"RESTAPI config error"
);
throw
re
;
}
// 2048bit Diffie-Hellman parameters from RFC3526
...
...
@@ -107,7 +108,8 @@ RESTHttpsServer::RESTHttpsServer(serverSettings_t settings) :
_acceptor
->
set_option
(
tcp
::
acceptor
::
reuse_address
(
true
));
}
catch
(
const
std
::
exception
&
e
)
{
ServerLOG
(
fatal
)
<<
"RestAPI address invalid! Please make sure IP address and port are valid!"
;
throw
;
std
::
runtime_error
re
(
"RESTAPI config error"
);
throw
re
;
}
}
...
...
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!
Cancel
Please
register
or
sign in
to comment