make analysis of session a separate background task #395
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
afeena
reviewed
Jul 19, 2020
|
don't forget to cancel the task in |
mzfr
force-pushed
the
analyze-in-background
branch
from
b40d09b
to
024de0b
Compare
afeena
requested changes
Jul 25, 2020
tanner/sessions/session_analyzer.py
Outdated
| session = json.loads(session) | ||
| result = await self.create_stats(session, redis_client) | ||
| await self.queue.put(result) | ||
| await self.save_session(redis_client, pg_client) |
There was a problem hiding this comment.
do we really need a separate save function or we can do everything in current function?
anyway, save should not be called after you put each session into the queue, it should be called once
tanner/sessions/session_manager.py
Outdated
| @@ -95,7 +95,7 @@ async def delete_session(self, sess, redis_client, pg_client): | |||
| await sess.remove_associated_env() | |||
| try: | |||
| await redis_client.set(sess.get_uuid(), sess.to_json()) | |||
| await self.analyzer.analyze(sess.get_uuid(), redis_client, pg_client) | |||
| # await self.analyzer.analyze(sess.get_uuid(), redis_client, pg_client) | |||
tanner/sessions/session_analyzer.py
Outdated
| session = json.loads(session) | ||
| result = await self.create_stats(session, redis_client) | ||
| await self.queue.put(result) | ||
| await self.save_session(redis_client, pg_client) | ||
|
|
||
| async def save_session(self, redis_client, pg_client): | ||
| while not self.queue.empty(): |
There was a problem hiding this comment.
you have try for redis error, but not postgres errors
mzfr
force-pushed
the
analyze-in-background
branch
from
c2c8a23
to
55da9d5
Compare
afeena
reviewed
Jul 27, 2020
tanner/sessions/session_analyzer.py
Outdated
| ) | ||
| except aioredis.ProtocolError as redis_error: | ||
| self.logger.exception( | ||
| "Error with redis. Session will be returned to the queue: %s", |
There was a problem hiding this comment.
there is no queue anymore to return the session to
afeena
reviewed
Jul 27, 2020
| ) | ||
| # This is the key which stores all the dorks. | ||
| # It matches the pattern of other keys. | ||
| except aioredis.errors.ReplyError: |
There was a problem hiding this comment.
can we avoid this by using another pattern for sessions?
added 6 commits
July 29, 2020 01:47
Also drop the usage of queue during analyze function
mzfr
force-pushed
the
analyze-in-background
branch
from
55da9d5
to
ccdd8d6
Compare
|
@mzfr could you please fix the tests? |
|
@afeena Yes I am working on them, Trying to understnad why they are failing. |
added 2 commits
July 31, 2020 00:13
Pull Request Test Coverage Report for Build 1381
💛 - Coveralls |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR will separate the analysis and deletion of the session.