Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
agkyra
Commits
8c482bca
Commit
8c482bca
authored
May 21, 2015
by
Giorgos Korfiatis
Browse files
add messages when warning
parent
7c82fd9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
agkyra/syncer/messaging.py
View file @
8c482bca
...
...
@@ -49,6 +49,36 @@ class UpdateMessage(Message):
(
self
.
archive
,
self
.
objname
,
self
.
serial
))
class
AlreadyProbedMessage
(
Message
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
Message
.
__init__
(
self
,
*
args
,
**
kwargs
)
self
.
archive
=
kwargs
[
"archive"
]
self
.
objname
=
kwargs
[
"objname"
]
self
.
serial
=
kwargs
[
"serial"
]
self
.
logger
.
warning
(
"Serial mismatch in probing archive: %s, "
"object: '%s'"
%
(
self
.
archive
,
self
.
objname
))
class
HeartbeatNoProbeMessage
(
Message
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
Message
.
__init__
(
self
,
*
args
,
**
kwargs
)
self
.
archive
=
kwargs
[
"archive"
]
self
.
objname
=
kwargs
[
"objname"
]
self
.
heartbeat
=
kwargs
[
"heartbeat"
]
self
.
logger
.
warning
(
"Object '%s' is being synced; "
"Probe in archive %s aborted."
%
(
self
.
objname
,
self
.
archive
))
class
HeartbeatNoDecideMessage
(
Message
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
Message
.
__init__
(
self
,
*
args
,
**
kwargs
)
self
.
objname
=
kwargs
[
"objname"
]
self
.
heartbeat
=
kwargs
[
"heartbeat"
]
self
.
logger
.
warning
(
"Object '%s' already handled; aborting."
%
self
.
objname
)
class
LiveInfoUpdateMessage
(
Message
):
def
__init__
(
self
,
*
args
,
**
kwargs
):
Message
.
__init__
(
self
,
*
args
,
**
kwargs
)
...
...
agkyra/syncer/syncer.py
View file @
8c482bca
...
...
@@ -120,12 +120,15 @@ class FileSyncer(object):
if
beat
is
not
None
:
if
utils
.
younger_than
(
beat
[
"tstamp"
],
self
.
settings
.
action_max_wait
):
logger
.
warning
(
"Object '%s' is being synced; "
"Probe aborted."
%
objname
)
msg
=
messaging
.
HeartbeatNoProbeMessage
(
archive
=
archive
,
objname
=
objname
,
heartbeat
=
beat
,
logger
=
logger
)
self
.
messager
.
put
(
msg
)
return
if
db_state
.
serial
!=
ref_state
.
serial
:
logger
.
warning
(
"Serial mismatch in probing archive: %s, "
"object: '%s'"
%
(
archive
,
objname
))
msg
=
messaging
.
AlreadyProbedMessage
(
archive
=
archive
,
objname
=
objname
,
serial
=
serial
,
logger
=
logger
)
self
.
messager
.
put
(
msg
)
return
live_state
=
client
.
probe_file
(
objname
,
db_state
,
ref_state
,
ident
)
if
live_state
is
not
None
:
...
...
@@ -202,8 +205,9 @@ class FileSyncer(object):
else
:
if
utils
.
younger_than
(
beat
[
"tstamp"
],
self
.
settings
.
action_max_wait
):
logger
.
warning
(
"Object '%s' already handled; aborting."
%
objname
)
msg
=
messaging
.
HeartbeatNoDecideMessage
(
objname
=
objname
,
heartbeat
=
beat
,
logger
=
logger
)
self
.
messager
.
put
(
msg
)
return
None
logger
.
warning
(
"Ignoring previous run: %s %s"
%
(
objname
,
beat
))
...
...
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