Skip to content
GitLab
Explore
Sign in
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
41dafc60
Commit
41dafc60
authored
12 years ago
by
Ruud Overeem
Browse files
Options
Downloads
Patches
Plain Diff
Task #1418: Moved some log-lines from DEBUG level to INFO level.
parent
79ec7e63
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+12
-12
12 additions, 12 deletions
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
with
12 additions
and
12 deletions
MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+
12
−
12
View file @
41dafc60
...
@@ -115,7 +115,7 @@ ObservationControl::ObservationControl(const string& cntlrName) :
...
@@ -115,7 +115,7 @@ ObservationControl::ObservationControl(const string& cntlrName) :
string
OLAPpos
=
globalParameterSet
()
->
locateModule
(
"OLAP"
);
string
OLAPpos
=
globalParameterSet
()
->
locateModule
(
"OLAP"
);
LOG_DEBUG
(
OLAPpos
+
"OLAP.IONProc.integrationSteps"
);
LOG_DEBUG
(
OLAPpos
+
"OLAP.IONProc.integrationSteps"
);
itsForcedQuitDelay
=
15
+
globalParameterSet
()
->
getUint32
(
OLAPpos
+
"OLAP.IONProc.integrationSteps"
,
0
);
itsForcedQuitDelay
=
15
+
globalParameterSet
()
->
getUint32
(
OLAPpos
+
"OLAP.IONProc.integrationSteps"
,
0
);
LOG_
DEBUG
_STR
(
"Timer for forcing quit is "
<<
itsForcedQuitDelay
<<
" seconds"
);
LOG_
INFO
_STR
(
"Timer for forcing quit is "
<<
itsForcedQuitDelay
<<
" seconds"
);
// Inform Logging manager who we are
// Inform Logging manager who we are
LOG_INFO_STR
(
"MACProcessScope: "
<<
createPropertySetName
(
PSN_OBSERVATION_CONTROL
,
getName
(),
itsObsDPname
));
LOG_INFO_STR
(
"MACProcessScope: "
<<
createPropertySetName
(
PSN_OBSERVATION_CONTROL
,
getName
(),
itsObsDPname
));
...
@@ -516,7 +516,7 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter
...
@@ -516,7 +516,7 @@ GCFEvent::TResult ObservationControl::active_state(GCFEvent& event, GCFPortInter
case
CONTROL_STARTED
:
{
case
CONTROL_STARTED
:
{
CONTROLStartedEvent
msg
(
event
);
CONTROLStartedEvent
msg
(
event
);
if
(
msg
.
successful
)
{
if
(
msg
.
successful
)
{
LOG_
DEBUG
_STR
(
"Start of "
<<
msg
.
cntlrName
<<
" was successful"
);
LOG_
INFO
_STR
(
"Start of "
<<
msg
.
cntlrName
<<
" was successful"
);
}
}
else
{
else
{
LOG_WARN_STR
(
"Start of "
<<
msg
.
cntlrName
<<
" was NOT successful"
);
LOG_WARN_STR
(
"Start of "
<<
msg
.
cntlrName
<<
" was NOT successful"
);
...
@@ -656,11 +656,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
...
@@ -656,11 +656,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
if
(
itsState
<
CTState
::
CLAIM
)
{
// claim state not done yet?
if
(
itsState
<
CTState
::
CLAIM
)
{
// claim state not done yet?
if
(
sec2claim
>
0
)
{
if
(
sec2claim
>
0
)
{
itsClaimTimer
=
itsTimerPort
->
setTimer
((
sec2claim
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2claim
);
itsClaimTimer
=
itsTimerPort
->
setTimer
((
sec2claim
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2claim
);
LOG_
DEBUG
_STR
(
"Claimperiod starts over "
<<
sec2claim
<<
" seconds"
);
LOG_
INFO
_STR
(
"Claimperiod starts over "
<<
sec2claim
<<
" seconds"
);
}
}
else
{
else
{
assumedState
=
CTState
::
CLAIM
;
assumedState
=
CTState
::
CLAIM
;
LOG_
DEBUG
_STR
(
"Claimperiod started "
<<
-
sec2claim
<<
" seconds AGO!"
);
LOG_
INFO
_STR
(
"Claimperiod started "
<<
-
sec2claim
<<
" seconds AGO!"
);
}
}
}
}
...
@@ -668,11 +668,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
...
@@ -668,11 +668,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
if
(
itsState
<
CTState
::
PREPARE
)
{
// prepare state not done yet?
if
(
itsState
<
CTState
::
PREPARE
)
{
// prepare state not done yet?
if
(
sec2prepare
>
0
)
{
if
(
sec2prepare
>
0
)
{
itsPrepareTimer
=
itsTimerPort
->
setTimer
((
sec2prepare
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2prepare
);
itsPrepareTimer
=
itsTimerPort
->
setTimer
((
sec2prepare
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2prepare
);
LOG_
DEBUG
_STR
(
"PreparePeriod starts over "
<<
sec2prepare
<<
" seconds"
);
LOG_
INFO
_STR
(
"PreparePeriod starts over "
<<
sec2prepare
<<
" seconds"
);
}
}
else
{
else
{
assumedState
=
CTState
::
PREPARE
;
assumedState
=
CTState
::
PREPARE
;
LOG_
DEBUG
_STR
(
"PreparePeriod started "
<<
-
sec2prepare
<<
" seconds AGO!"
);
LOG_
INFO
_STR
(
"PreparePeriod started "
<<
-
sec2prepare
<<
" seconds AGO!"
);
}
}
}
}
...
@@ -680,11 +680,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
...
@@ -680,11 +680,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
if
(
itsState
<
CTState
::
RESUME
)
{
// not yet active?
if
(
itsState
<
CTState
::
RESUME
)
{
// not yet active?
if
(
sec2start
>
0
)
{
if
(
sec2start
>
0
)
{
itsStartTimer
=
itsTimerPort
->
setTimer
((
sec2start
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2start
);
itsStartTimer
=
itsTimerPort
->
setTimer
((
sec2start
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2start
);
LOG_
DEBUG
_STR
(
"Observation starts over "
<<
sec2start
<<
" seconds"
);
LOG_
INFO
_STR
(
"Observation starts over "
<<
sec2start
<<
" seconds"
);
}
}
else
{
else
{
assumedState
=
CTState
::
RESUME
;
assumedState
=
CTState
::
RESUME
;
LOG_
DEBUG
_STR
(
"Observation started "
<<
-
sec2start
<<
" seconds AGO!"
);
LOG_
INFO
_STR
(
"Observation started "
<<
-
sec2start
<<
" seconds AGO!"
);
}
}
}
}
...
@@ -694,11 +694,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
...
@@ -694,11 +694,11 @@ void ObservationControl::setObservationTimers(double minimalDelay)
itsStopTimer
=
itsTimerPort
->
setTimer
((
sec2stop
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2stop
);
itsStopTimer
=
itsTimerPort
->
setTimer
((
sec2stop
<
minimalDelay
)
?
minimalDelay
:
1.0
*
sec2stop
);
// make sure we go down 30 seconds after quit was requested.
// make sure we go down 30 seconds after quit was requested.
itsForcedQuitTimer
=
itsTimerPort
->
setTimer
(
sec2stop
+
(
1.0
*
itsForcedQuitDelay
));
itsForcedQuitTimer
=
itsTimerPort
->
setTimer
(
sec2stop
+
(
1.0
*
itsForcedQuitDelay
));
LOG_
DEBUG
_STR
(
"Observation stops over "
<<
sec2stop
<<
" seconds"
);
LOG_
INFO
_STR
(
"Observation stops over "
<<
sec2stop
<<
" seconds"
);
}
}
else
{
else
{
assumedState
=
CTState
::
RELEASE
;
assumedState
=
CTState
::
RELEASE
;
LOG_
DEBUG
_STR
(
"Observation should have been stopped "
<<
-
sec2start
<<
LOG_
INFO
_STR
(
"Observation should have been stopped "
<<
-
sec2start
<<
" seconds AGO!"
);
" seconds AGO!"
);
}
}
}
}
...
@@ -715,7 +715,7 @@ void ObservationControl::setObservationTimers(double minimalDelay)
...
@@ -715,7 +715,7 @@ void ObservationControl::setObservationTimers(double minimalDelay)
default:
break
;
// satisfy compiler
default:
break
;
// satisfy compiler
}
}
LOG_
DEBUG
_STR
(
"Observation ends at "
<<
to_simple_string
(
itsStopTime
));
LOG_
INFO
_STR
(
"Observation ends at "
<<
to_simple_string
(
itsStopTime
));
}
}
//
//
...
@@ -969,7 +969,7 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event)
...
@@ -969,7 +969,7 @@ void ObservationControl::_databaseEventHandler(GCFEvent& event)
newTime
=
time_from_string
(
newVal
);
newTime
=
time_from_string
(
newVal
);
}
}
catch
(
std
::
exception
&
e
)
{
catch
(
std
::
exception
&
e
)
{
LOG_
DEBUG
_STR
(
newVal
<<
" is not a legal time!!!"
);
LOG_
ERROR
_STR
(
newVal
<<
" is not a legal time!!!"
);
return
;
return
;
}
}
if
(
strstr
(
dpEvent
.
DPname
.
c_str
(),
PN_OBS_START_TIME
)
!=
0
)
{
if
(
strstr
(
dpEvent
.
DPname
.
c_str
(),
PN_OBS_START_TIME
)
!=
0
)
{
...
...
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