Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rafael Monnerat
erp5
Commits
79b9e47a
Commit
79b9e47a
authored
Oct 04, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WSGI: use haufe.requestmonitoring to replace Products.LongRequestLogger
parent
c1f24bd9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
125 additions
and
0 deletions
+125
-0
product/ERP5/bin/zopewsgi.py
product/ERP5/bin/zopewsgi.py
+8
-0
product/ERP5Type/patches/LongRequestLogger_dumper.py
product/ERP5Type/patches/LongRequestLogger_dumper.py
+117
-0
No files found.
product/ERP5/bin/zopewsgi.py
View file @
79b9e47a
...
@@ -166,6 +166,7 @@ def runwsgi():
...
@@ -166,6 +166,7 @@ def runwsgi():
parser
=
argparse
.
ArgumentParser
()
parser
=
argparse
.
ArgumentParser
()
parser
.
add_argument
(
'--event-log-file'
,
help
=
'Event log file'
)
parser
.
add_argument
(
'--event-log-file'
,
help
=
'Event log file'
)
parser
.
add_argument
(
'--access-log-file'
,
help
=
'Access log file'
)
parser
.
add_argument
(
'--access-log-file'
,
help
=
'Access log file'
)
parser
.
add_argument
(
'--long-request-log-file'
,
help
=
'Long requests log file'
)
parser
.
add_argument
(
'-w'
,
'--webdav'
,
action
=
'store_true'
)
parser
.
add_argument
(
'-w'
,
'--webdav'
,
action
=
'store_true'
)
parser
.
add_argument
(
'address'
,
help
=
'<ip>:<port>'
)
parser
.
add_argument
(
'address'
,
help
=
'<ip>:<port>'
)
parser
.
add_argument
(
'zope_conf'
,
help
=
'path to zope.conf'
)
parser
.
add_argument
(
'zope_conf'
,
help
=
'path to zope.conf'
)
...
@@ -202,6 +203,13 @@ def runwsgi():
...
@@ -202,6 +203,13 @@ def runwsgi():
access_log_logger
.
propagate
=
False
access_log_logger
.
propagate
=
False
access_log_logger
.
addHandler
(
access_log_handler
)
access_log_logger
.
addHandler
(
access_log_handler
)
if
args
.
long_request_log_file
:
from
Products.ERP5Type.patches
import
LongRequestLogger_dumper
long_request_log_handler
=
logging
.
FileHandler
(
args
.
long_request_log_file
)
long_request_log_handler
.
setFormatter
(
logging
.
Formatter
(
"%(asctime)s - %(message)s"
))
LongRequestLogger_dumper
.
logger
.
propagate
=
False
LongRequestLogger_dumper
.
logger
.
addHandler
(
long_request_log_handler
)
if
conf
.
debug_mode
:
if
conf
.
debug_mode
:
console_handler
=
logging
.
StreamHandler
(
sys
.
stderr
)
console_handler
=
logging
.
StreamHandler
(
sys
.
stderr
)
console_handler
.
setFormatter
(
logging
.
Formatter
(
console_handler
.
setFormatter
(
logging
.
Formatter
(
...
...
product/ERP5Type/patches/LongRequestLogger_dumper.py
0 → 100644
View file @
79b9e47a
##############################################################################
#
# From Products.LongRequestLogger, adjusted for haufe.requestmonitoring
#
# Copyright (c) 2010,2012 Zope Foundation and Contributors.
#
##############################################################################
from
pprint
import
pformat
import
logging
import
os
import
sys
import
time
import
traceback
from
six.moves
import
StringIO
from
six.moves._thread
import
get_ident
logger
=
logging
.
getLogger
(
'Products.LongRequestLogger'
)
SUBJECT_FORMAT
=
"Thread %s: Started on %.1f; Running for %.1f secs; "
REQUEST_FORMAT
=
"""
\
request: %(method)s %(url)s
retry count: %(retries)s
form: %(form)s
other: %(other)s
"""
class
Dumper
(
object
):
_last
=
None
,
None
,
None
def
__init__
(
self
,
thread_id
):
self
.
thread_id
=
thread_id
def
_format_request
(
self
,
request
):
if
request
is
None
:
return
"[No request]
\
n
"
try
:
query
=
request
.
get
(
"QUERY_STRING"
)
return
REQUEST_FORMAT
%
{
"method"
:
request
[
"REQUEST_METHOD"
],
"url"
:
request
.
getURL
()
+
(
"?"
+
query
if
query
else
""
),
"retries"
:
request
.
retry_count
,
"form"
:
pformat
(
request
.
form
),
"other"
:
pformat
(
request
.
other
),
}
except
Exception
:
return
"[Unprintable request]
\
n
"
+
traceback
.
format_exc
()
# A fork of ZMySQLDA is maintained in ERP5 (http://www.erp5.com/)
try
:
from
Products.ZMySQLDA.db
import
DB
except
ImportError
:
def
_extract_sql
(
self
,
frame
):
pass
else
:
def
_extract_sql
(
self
,
frame
,
func_code
=
DB
.
_query
.
__code__
):
while
frame
is
not
None
:
if
frame
.
f_code
is
func_code
:
return
frame
.
f_locals
[
'query'
]
frame
=
frame
.
f_back
del
DB
def
format_log_entry
(
self
,
request
,
start
,
duration
):
subject
=
SUBJECT_FORMAT
%
(
self
.
thread_id
,
start
,
duration
)
frame
=
sys
.
_current_frames
()[
self
.
thread_id
]
try
:
request_text
=
self
.
_format_request
(
request
)
stack
=
traceback
.
extract_stack
(
frame
)
query
=
self
.
_extract_sql
(
frame
)
finally
:
del
frame
body
=
request_text
,
stack
,
query
if
self
.
_last
==
body
:
return
subject
+
"Same.
\
n
"
result
=
StringIO
()
result
.
write
(
subject
)
if
request
!=
self
.
_last
[
0
]:
result
.
write
(
request_text
)
if
stack
!=
self
.
_last
[
1
]:
result
.
write
(
"Traceback:
\
n
"
)
traceback
.
print_list
(
stack
,
result
)
if
query
:
result
.
write
(
"SQL Query:%s
\
n
"
%
(
" Same."
if
query
==
self
.
_last
[
2
]
else
'
\
n
'
+
query
))
self
.
_last
=
body
return
result
.
getvalue
()
class
Handler
(
object
):
def
__init__
(
self
,
config
):
self
.
config
=
config
self
.
loglevel
=
int
(
getattr
(
logging
,
config
.
loglevel
,
logging
.
WARNING
))
self
.
dumpers_by_thread_id
=
{}
# type: dict[int, Dumper]
def
__call__
(
self
,
req
,
handlerState
,
globalState
):
threadId
=
req
.
threadId
try
:
dumper
=
self
.
dumpers_by_thread_id
[
threadId
]
except
KeyError
:
dumper
=
self
.
dumpers_by_thread_id
.
setdefault
(
threadId
,
Dumper
(
threadId
))
log_entry
=
dumper
.
format_log_entry
(
req
.
request
,
req
.
startTime
,
handlerState
.
monitorTime
-
req
.
startTime
)
if
os
.
environ
.
get
(
'DISABLE_HAUFE_MONITORING_ON_PDB'
)
\
and
log_entry
.
find
(
" Module pdb,"
)
>
-
1
:
return
logger
.
log
(
self
.
loglevel
,
log_entry
)
def
factory
(
config
):
"""Factory to use with haufe.requestmonitoring (for zope.conf)
"""
return
Handler
(
config
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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