Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
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
Jérome Perrin
neoppod
Commits
163858ed
Commit
163858ed
authored
Oct 17, 2018
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qa: fix attributeTracker
parent
fa14157b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
neo/lib/locking.py
neo/lib/locking.py
+5
-4
neo/lib/node.py
neo/lib/node.py
+2
-2
No files found.
neo/lib/locking.py
View file @
163858ed
...
@@ -26,7 +26,7 @@ from Queue import Empty
...
@@ -26,7 +26,7 @@ from Queue import Empty
class
LockUser
(
object
):
class
LockUser
(
object
):
def
__init__
(
self
,
message
,
level
=
0
):
def
__init__
(
self
,
message
=
None
,
level
=
0
):
t
=
threading
.
currentThread
()
t
=
threading
.
currentThread
()
ident
=
getattr
(
t
,
'node_name'
,
t
.
name
)
ident
=
getattr
(
t
,
'node_name'
,
t
.
name
)
# This class is instantiated from a place desiring to known what
# This class is instantiated from a place desiring to known what
...
@@ -42,6 +42,7 @@ class LockUser(object):
...
@@ -42,6 +42,7 @@ class LockUser(object):
# current Neo directory structure.
# current Neo directory structure.
path
=
os
.
path
.
join
(
'...'
,
*
path
.
split
(
os
.
path
.
sep
)[
-
3
:])
path
=
os
.
path
.
join
(
'...'
,
*
path
.
split
(
os
.
path
.
sep
)[
-
3
:])
self
.
time
=
time
()
self
.
time
=
time
()
if
message
is
not
None
:
self
.
ident
=
"%s@%r %s:%s %s"
%
(
self
.
ident
=
"%s@%r %s:%s %s"
%
(
ident
,
self
.
time
,
path
,
line_number
,
line
)
ident
,
self
.
time
,
path
,
line_number
,
line
)
self
.
note
(
message
)
self
.
note
(
message
)
...
...
neo/lib/node.py
View file @
163858ed
...
@@ -118,8 +118,8 @@ class Node(object):
...
@@ -118,8 +118,8 @@ class Node(object):
if
connection
.
isServer
():
if
connection
.
isServer
():
self
.
setIdentified
()
self
.
setIdentified
()
else
:
else
:
assert
force
is
not
None
,
\
assert
force
is
not
None
,
(
conn
,
attributeTracker
.
whoSet
(
self
,
'_connection'
)
attributeTracker
.
whoSet
(
self
,
'_connection'
)
)
# The test on peer_id is there to protect against buggy nodes.
# The test on peer_id is there to protect against buggy nodes.
# XXX: handler comparison does not cover all cases: there may
# XXX: handler comparison does not cover all cases: there may
# be a pending handler change, which won't be detected, or a future
# be a pending handler change, which won't be detected, or a future
...
...
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