Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue 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
Peter Sherwood
athena
Commits
7af70b03
Commit
7af70b03
authored
4 years ago
by
Mark Stockton
Browse files
Options
Downloads
Patches
Plain Diff
Improve handling of Frontier warnings
parent
3defd9f6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
+11
-1
11 additions, 1 deletion
...rigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
with
11 additions
and
1 deletion
Trigger/TrigConfiguration/TrigConfigSvc/python/TrigConf2COOLLib.py
+
11
−
1
View file @
7af70b03
...
...
@@ -11,6 +11,7 @@
#
# Required libs:
import
os
import
re
import
threading
import
AthenaCommon.Logging
as
L
...
...
@@ -29,11 +30,19 @@ class TmpThr(threading.Thread):
line
=
line
.
lower
()
if
'
warning
'
in
line
:
maxlevel
=
max
(
1
,
maxlevel
)
if
'
error
'
in
line
and
'
connection refused
'
not
in
line
:
if
re
.
search
(
r
"
warn\s*\[frontier
"
,
line
)
is
not
None
:
# Catch frontier warnings which could contain the word "error" as
# frontier will retry connections - full log shown if run in debug
msg
.
info
(
"
Caught warning from frontier: %s
"
,
line
)
elif
'
error
'
in
line
and
'
connection refused
'
not
in
line
:
maxlevel
=
max
(
2
,
maxlevel
)
elif
'
fatal
'
in
line
.
lower
()
or
'
exception
'
in
line
.
lower
():
maxlevel
=
max
(
3
,
maxlevel
)
output
=
''
.
join
(
output
)
output
=
(
'
Log file from execution of command:
\n
'
+
output
+
'
========================================
'
+
'
\n
End of log file from TrigConf2COOLLib.py
'
)
if
maxlevel
==
1
:
msg
.
warning
(
output
)
elif
maxlevel
==
2
:
...
...
@@ -42,6 +51,7 @@ class TmpThr(threading.Thread):
msg
.
fatal
(
output
)
else
:
msg
.
debug
(
output
)
msg
.
info
(
'
Successful execution of command
'
)
class
TrigConf2CoolSyncSvc
(
PyAthena
.
Svc
):
def
__init__
(
self
,
name
=
"
TrigConf2CoolSyncSvc
"
,
**
kw
):
...
...
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