Skip to content

[Enhancement] simplify python rules #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[Enhancement] simplify python rules #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71cc0fa
simplify python rules
Oct 17, 2019
55b143d
use second entrypoint instead of simplified rule
Oct 17, 2019
74b7b44
add test to detect two subsequent lines starting with ' File'
Oct 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/fluent/plugin/exception_detector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def self.supported

PYTHON_RULES = [
rule(:start_state, /^Traceback \(most recent call last\):$/, :python),
rule(:python, /^[\t ]+File /, :python_code),
rule([:python, :python_code], /^[\t ]+File /, :python_code),
rule(:python_code, /[^\t ]/, :python),
rule(:python, /^(?:[^\s.():]+\.)*[^\s.():]+:/, :start_state)
].freeze
Expand Down
20 changes: 20 additions & 0 deletions test/plugin/test_exception_detector.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,24 @@ class ExceptionDetectorTest < Test::Unit::TestCase
File "/base/data/home/apps/s~nearfieldspy/1.378705245900539993/nearfieldspy.py", line 5, in get
raise Exception('spam', 'eggs')
Exception: ('spam', 'eggs')
END

PYTHON_DOUBLE_FILE_EXC = <<END.freeze
Traceback (most recent call last):
File "/usr/local/lib/python3.6/site-packages/flask/app.py", line 2292, in wsgi_app
response = self.full_dispatch_request()
File "/usr/local/lib/python3.6/site-packages/flask/app.py", line 1815, in full_dispatch_request
rv = self.handle_user_exception(e)
File "/usr/local/lib/python3.6/site-packages/sqlalchemy/sql/operators.py", line 1219, in in_op
return a.in_(b)
File "/usr/local/lib/python3.6/site-packages/sqlalchemy/sql/operators.py", line 593, in in_
return self.operate(in_op, other)
File "<string>", line 1, in <lambda>
File "/usr/local/lib/python3.6/site-packages/sqlalchemy/sql/type_api.py", line 66, in operate
return o[0](self.expr, op, *(other + o[1:]), **kwargs)
File "/usr/local/lib/python3.6/site-packages/sqlalchemy/sql/default_comparator.py", line 194, in _in_impl
for o in seq_or_selectable:
TypeError: 'NoneType' object is not iterable
END

PHP_EXC = <<END.freeze
Expand Down Expand Up @@ -623,6 +641,7 @@ def test_csharp

def test_python
check_exception(PYTHON_EXC, true)
check_exception(PYTHON_DOUBLE_FILE_EXC, true)
end

def test_php
Expand Down Expand Up @@ -668,6 +687,7 @@ def test_dart
def test_mixed_languages
check_exception(JAVA_EXC, false)
check_exception(PYTHON_EXC, true)
check_exception(PYTHON_DOUBLE_FILE_EXC, true)
check_exception(COMPLEX_JAVA_EXC, false)
check_exception(NODE_JS_EXC, false)
check_exception(PHP_EXC, false)
Expand Down